[phpmix-cvs] drupal/modules/akismet akismet.module,1.15,1.16

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

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

Modified Files:
	akismet.module 
Log Message:
Added new settings for e-mail notification. The actual implementation is coming...

Index: akismet.module
===================================================================
RCS file: /cvsroot/phpmix/drupal/modules/akismet/akismet.module,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** akismet.module	10 Jun 2006 02:30:10 -0000	1.15
--- akismet.module	10 Jun 2006 13:14:44 -0000	1.16
***************
*** 264,269 ****
    }
    $form['service']['akismet_connection_enabled'] = array(
!     '#type' => 'radios',
!     '#title' => t('Akismet connections'),
      '#options' => $enable_options,
      '#default_value' => variable_get('akismet_connection_enabled', 1),
--- 264,268 ----
    }
    $form['service']['akismet_connection_enabled'] = array(
!     '#type' => 'radios', '#title' => t('Akismet connections'),
      '#options' => $enable_options,
      '#default_value' => variable_get('akismet_connection_enabled', 1),
***************
*** 333,338 ****
    );
    $form['node_options']['akismet_check_nodetypes'] = array(
!     '#type' => 'checkboxes',
!     '#title' => t('Check for spam in these node types'),
      '#options' => node_get_types(),
      '#default_value' => variable_get('akismet_check_nodetypes', NULL),
--- 332,336 ----
    );
    $form['node_options']['akismet_check_nodetypes'] = array(
!     '#type' => 'checkboxes', '#title' => t('Check for spam in these node types'),
      '#options' => node_get_types(),
      '#default_value' => variable_get('akismet_check_nodetypes', NULL),
***************
*** 345,350 ****
    );
    $form['node_options']['akismet_node_publish_links'] = array(
!     '#type' => 'radios',
!     '#title' => t('Show publish/unpublish links'),
      '#options' => $enable_options,
      '#default_value' => variable_get('akismet_node_publish_links', 0),
--- 343,347 ----
    );
    $form['node_options']['akismet_node_publish_links'] = array(
!     '#type' => 'radios', '#title' => t('Show publish/unpublish links'),
      '#options' => $enable_options,
      '#default_value' => variable_get('akismet_node_publish_links', 0),
***************
*** 356,361 ****
    );
    $form['node_options']['akismet_node_spam_links'] = array(
!     '#type' => 'radios',
!     '#title' => t('Show submit spam/ham links'),
      '#options' => $enable_options,
      '#default_value' => variable_get('akismet_node_spam_links', 0),
--- 353,357 ----
    );
    $form['node_options']['akismet_node_spam_links'] = array(
!     '#type' => 'radios', '#title' => t('Show submit spam/ham links'),
      '#options' => $enable_options,
      '#default_value' => variable_get('akismet_node_spam_links', 0),
***************
*** 377,382 ****
      );
      $form['comment_options']['akismet_check_comments'] = array(
!       '#type' => 'radios',
!       '#title' => t('Check for spam in comments'),
        '#options' => $enable_options,
        '#default_value' => variable_get('akismet_check_comments', 1),
--- 373,377 ----
      );
      $form['comment_options']['akismet_check_comments'] = array(
!       '#type' => 'radios', '#title' => t('Check for spam in comments'),
        '#options' => $enable_options,
        '#default_value' => variable_get('akismet_check_comments', 1),
***************
*** 389,394 ****
      );
      $form['comment_options']['akismet_comment_publish_links'] = array(
!       '#type' => 'radios',
!       '#title' => t('Show publish/unpublish links'),
        '#options' => $enable_options,
        '#default_value' => variable_get('akismet_comment_publish_links', 1),
--- 384,388 ----
      );
      $form['comment_options']['akismet_comment_publish_links'] = array(
!       '#type' => 'radios', '#title' => t('Show publish/unpublish links'),
        '#options' => $enable_options,
        '#default_value' => variable_get('akismet_comment_publish_links', 1),
***************
*** 400,405 ****
      );
      $form['comment_options']['akismet_comment_spam_links'] = array(
!       '#type' => 'radios',
!       '#title' => t('Show submit spam/ham links'),
        '#options' => $enable_options,
        '#default_value' => variable_get('akismet_comment_spam_links', 1),
--- 394,398 ----
      );
      $form['comment_options']['akismet_comment_spam_links'] = array(
!       '#type' => 'radios', '#title' => t('Show submit spam/ham links'),
        '#options' => $enable_options,
        '#default_value' => variable_get('akismet_comment_spam_links', 1),
***************
*** 450,453 ****
--- 443,480 ----
    );
  
+   $email_to_options = array(
+     'site_email' => t('Main Site Address'),
+     'site_admin' => t('Main Site Administrator'),
+     'content_admins' => t('Content Administrators'),
+     'content_moderators' => t('Content Moderators')
+   );
+   $email_when_options = array(
+     'all' => t('Content is posted'),
+     'approval' => t('Only content needing approval'),
+     'never' => t('Never')
+   );
+   $form['email_options'] = array(
+     '#type' => 'fieldset', '#title' => t('E-mail Options'),
+     '#collapsible' => TRUE, '#collapsed' => TRUE
+   );
+   $form['email_options']['akismet_email_to'] = array(
+     '#type' => 'checkboxes', '#title' => t('Send e-mails to'),
+     '#options' => $email_to_options,
+     '#default_value' => variable_get('akismet_email_to', 0),
+     '#description' => t('Use this option to select groups of users to whom e-mail notifications will be sent, when content is posted, based on the criteria specified below. It worths to mention that content administrators and moderators will only be notified about posts they have proper access to.')
+   );
+   $form['email_options']['akismet_email_exclude_self'] = array(
+     '#type' => 'radios', '#title' => t('Exclude notifications to self poster'),
+     '#options' => $enable_options,
+     '#default_value' => variable_get('akismet_email_exclude_self', 1),
+     '#description' => t('Use this option to exclude self poster from receiving e-mail notifications.')
+   );
+   $form['email_options']['akismet_email_when'] = array(
+     '#type' => 'radios', '#title' => t('Send e-mails when'),
+     '#options' => $email_when_options,
+     '#default_value' => variable_get('akismet_email_when', 'approval'),
+     '#description' => t('Use this option to specify the critica for which the user groups specified above should receive e-mail notifications.')
+   );
+ 
    return $form;
  }