[phpmix-cvs] drupal/modules/akismet akismet_admin.inc, 1.1, 1.2 CHANGELOG.txt, 1.2, 1.3

[<php...@li...>]

Update of /cvsroot/phpmix/drupal/modules/akismet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28252

Modified Files:
	akismet_admin.inc CHANGELOG.txt 
Log Message:
I believe I forgot to mention that a new feature is being added to prevent Denial of Service situations caused by certain spambots.
Here, I'm revising the related new options. The actual implementaion of the corresponding checks/actions is coming...

Index: CHANGELOG.txt
===================================================================
RCS file: /cvsroot/phpmix/drupal/modules/akismet/CHANGELOG.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CHANGELOG.txt	18 Jun 2006 11:04:19 -0000	1.2
--- CHANGELOG.txt	18 Jun 2006 11:53:25 -0000	1.3
***************
*** 4,7 ****
--- 4,9 ----
  Akismet module in CVS
  ------------------------------------------------
+ - Added experimental feature: anti-spambot options to prevent from
+   Denial of Service (DoS) caused by certain spambots.
  - Rewritten moderation queue. It is now a bit more powerful, allowing
    operations against multiple items.

Index: akismet_admin.inc
===================================================================
RCS file: /cvsroot/phpmix/drupal/modules/akismet/akismet_admin.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** akismet_admin.inc	18 Jun 2006 11:04:17 -0000	1.1
--- akismet_admin.inc	18 Jun 2006 11:53:25 -0000	1.2
***************
*** 229,238 ****
      '#type' => 'fieldset', '#title' => t('Anti-Spambot Options'),
      '#collapsible' => TRUE, '#collapsed' => TRUE,
!     '#description' => t('The goal of this section is not to replace anything that the <a href="%akismet">Akismet Service</a> itself can do a lot better than us, but to provide a set of simple rules that can be applied to prevent from certain types of spambot attacks.',
        array(
          '%akismet' => 'http://akismet.com'
        ))
    );
!   $delay_options = drupal_map_assoc(array(0, 30, 60, 90, 120), 'format_interval');
    $delay_options[0] = t('none');
    $form['anti_spambot']['akismet_spambot_delay'] = array(
--- 229,238 ----
      '#type' => 'fieldset', '#title' => t('Anti-Spambot Options'),
      '#collapsible' => TRUE, '#collapsed' => TRUE,
!     '#description' => t('The goal of this section is not to replace anything that the <a href="%akismet">Akismet Service</a> itself can do a lot better than us, but to provide a set of simple rules aimed to prevent Denial of Service (DoS) situations that could be caused by certain spambots.',
        array(
          '%akismet' => 'http://akismet.com'
        ))
    );
!   $delay_options = drupal_map_assoc(array(0, 30, 60, 90, 120, 150, 180), 'format_interval');
    $delay_options[0] = t('none');
    $form['anti_spambot']['akismet_spambot_delay'] = array(
***************
*** 240,248 ****
      '#default_value' => variable_get('akismet_spambot_delay', 60),
      '#options' => $delay_options,
!     '#description' => t('Use this option to delay the response to submitted content that has been marked as spam or to requests that are being identified by anti-spambot rules.')
    );
    $anti_spambot_detection = array(
!     'ip' => t('IP addresses that have detected spam in the moderation queue'),
!     'dup' => t('Duplicated content that has already been identified as spam'),
    );
    $form['anti_spambot']['akismet_spambot_detection'] = array(
--- 240,248 ----
      '#default_value' => variable_get('akismet_spambot_delay', 60),
      '#options' => $delay_options,
!     '#description' => t('Use this option to delay the response when content has been identified as spam or to requests that match the rules defined below.')
    );
    $anti_spambot_detection = array(
!     'ip' => t('IP addresses used by known spammers'),
!     'dup' => t('Content that has already been identified as spam'),
    );
    $form['anti_spambot']['akismet_spambot_detection'] = array(
***************
*** 250,258 ****
      '#options' => $anti_spambot_detection,
      '#default_value' => variable_get('akismet_spambot_detection', ''),
!     '#description' => t('Mark the rules by which spambots may be identified.')
    );
    $anti_spambot_actions = array(
      'none' => t('None (only the delay specified above, if any)'),
!     '403a' => t('Generate a 403 error (normal)'),
      '403b' => t('Generate a 403 error (blank page)')
    );
--- 250,262 ----
      '#options' => $anti_spambot_detection,
      '#default_value' => variable_get('akismet_spambot_detection', ''),
!     '#description' => t('These rules will be applied before sending any request to the <a href="%akismet">Akismet Service</a>. If a request to send content matches any of these rules, the actions defined below will be triggered. Requests to send content are checked against spam that is stored locally (visible from the <a href="%moderation-queue">moderation queue</a>).',
!       array(
!         '%akismet' => 'http://akismet.com',
!         '%moderation-queue' => url('admin/akismet')
!       ))
    );
    $anti_spambot_actions = array(
      'none' => t('None (only the delay specified above, if any)'),
!     '403a' => t('Generate a 403 error (Drupal generated page)'),
      '403b' => t('Generate a 403 error (blank page)')
    );
***************
*** 261,265 ****
      '#options' => $anti_spambot_actions,
      '#default_value' => variable_get('akismet_spambot_action', '403b'),
!     '#description' => t('Use this option to specify what to do agaisnt identified spambots.')
    );
  
--- 265,273 ----
      '#options' => $anti_spambot_actions,
      '#default_value' => variable_get('akismet_spambot_action', '403b'),
!     '#description' => t('Use this option to specify what to do against spambots identified by any of the above rules. When a <em>403 error</em> (access denied) is generated, no request to the <a href="%akismet">Akismet Service</a> will be made, the request to post content will not be stored into database and no further moderator notifications will be sent. If any case, when a rule matches, a record of the event will be <a href="%admin-logs">logged</a> for further analysis.',
!       array(
!         '%akismet' => 'http://akismet.com',
!         '%admin-logs' => url('admin/logs')
!       ))
    );