updated webform localization and phone, uuid, term_merge, spambot, performance
This commit is contained in:
Bachir Soussi Chiadmi
@@ -1,70 +1,110 @@
|
||||
<?php
|
||||
|
||||
function spambot_settings_form($form, &$form_state) {
|
||||
$numbers = array(0 => t('Never'), 1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 15 => 15, 20 => 20, 30 => 30, 40 => 40, 50 => 50, 60 => 60, 70 => 70, 80 => 80, 90 => 90, 100 => 100, 150 => 150, 200 => 200);
|
||||
/**
|
||||
* @file
|
||||
* Administration part (forms and pages) for Spambot module.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Form builder for settings form.
|
||||
*/
|
||||
function spambot_settings_form() {
|
||||
$numbers = array(
|
||||
1 => 1,
|
||||
2 => 2,
|
||||
3 => 3,
|
||||
4 => 4,
|
||||
5 => 5,
|
||||
6 => 6,
|
||||
7 => 7,
|
||||
8 => 8,
|
||||
9 => 9,
|
||||
10 => 10,
|
||||
15 => 15,
|
||||
20 => 20,
|
||||
30 => 30,
|
||||
40 => 40,
|
||||
50 => 50,
|
||||
60 => 60,
|
||||
70 => 70,
|
||||
80 => 80,
|
||||
90 => 90,
|
||||
100 => 100,
|
||||
150 => 150,
|
||||
200 => 200,
|
||||
);
|
||||
|
||||
// Fieldset for set up spam criteria.
|
||||
$form['criteria'] = array(
|
||||
'#type' => 'fieldset',
|
||||
'#title' => t('Spammer criteria'),
|
||||
'#description' => t('A user account or an attempted user registration will be deemed a spammer if the email, username, or IP address has been reported to www.stopforumspam.com more times than the following thresholds.'),
|
||||
'#collapsible' => TRUE,
|
||||
'#collapsed' => TRUE,
|
||||
);
|
||||
$form['criteria']['spambot_criteria_email'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => t('Number of times the email has been reported is equal to or more than'),
|
||||
'#description' => t('If the email address for a user or user registration has been reported to www.stopforumspam.com this many times, then it is deemed as a spammer.'),
|
||||
'#options' => array(0 => t('Don\'t use email as a criteria')) + $numbers,
|
||||
'#default_value' => variable_get('spambot_criteria_email', 1),
|
||||
'#options' => array(0 => t("Don't use email as a criteria")) + $numbers,
|
||||
'#default_value' => variable_get('spambot_criteria_email', SPAMBOT_DEFAULT_CRITERIA_EMAIL),
|
||||
);
|
||||
$form['criteria']['spambot_criteria_username'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => t('Number of times the username has been reported is equal to or more than'),
|
||||
'#description' => t('If the username for a user or user registration has been reported to www.stopforumspam.com this many times, then it is deemed as a spammer. Be careful about using this option as you may accidentally block genuine users who happen to choose the same username as a known spammer.'),
|
||||
'#options' => array(0 => t('Don\'t use username as a criteria')) + $numbers,
|
||||
'#default_value' => variable_get('spambot_criteria_username', 0),
|
||||
'#options' => array(0 => t("Don't use username as a criteria")) + $numbers,
|
||||
'#default_value' => variable_get('spambot_criteria_username', SPAMBOT_DEFAULT_CRITERIA_USERNAME),
|
||||
);
|
||||
$form['criteria']['spambot_criteria_ip'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => t('Number of times the IP address has been reported is equal to or more than'),
|
||||
'#description' => t('If the IP address for a user or user registration has been reported to www.stopforumspam.com this many times, then it is deemed as a spammer. Be careful about setting this threshold too low as IP addresses can change.'),
|
||||
'#options' => array(0 => t('Don\'t use IP address as a criteria')) + $numbers,
|
||||
'#default_value' => variable_get('spambot_criteria_ip', 20),
|
||||
'#options' => array(0 => t("Don't use IP address as a criteria")) + $numbers,
|
||||
'#default_value' => variable_get('spambot_criteria_ip', SPAMBOT_DEFAULT_CRITERIA_IP),
|
||||
);
|
||||
|
||||
// White lists.
|
||||
$form['spambot_whitelist'] = array(
|
||||
'#type' => 'fieldset',
|
||||
'#title' => t('Whitelists'),
|
||||
'#collapsible' => TRUE,
|
||||
'#collapsed' => TRUE,
|
||||
);
|
||||
$form['spambot_whitelist']['spambot_whitelist_email'] = array(
|
||||
'#type' => 'textarea',
|
||||
'#title' => t('Allowed email addresses'),
|
||||
'#description' => t('Enter email addresses, one per line.'),
|
||||
'#default_value' => variable_get('spambot_whitelist_email', ''),
|
||||
);
|
||||
$form['spambot_whitelist']['spambot_whitelist_username'] = array(
|
||||
'#type' => 'textarea',
|
||||
'#title' => t('Allowed usernames'),
|
||||
'#description' => t('Enter usernames, one per line.'),
|
||||
'#default_value' => variable_get('spambot_whitelist_username', ''),
|
||||
);
|
||||
$form['spambot_whitelist']['spambot_whitelist_ip'] = array(
|
||||
'#type' => 'textarea',
|
||||
'#title' => t('Allowed IP addresses'),
|
||||
'#description' => t('Enter IP addresses, one per line.'),
|
||||
'#default_value' => variable_get('spambot_whitelist_ip', ''),
|
||||
);
|
||||
|
||||
// Fieldset for configure protecting at user register form.
|
||||
$form['register'] = array(
|
||||
'#type' => 'fieldset',
|
||||
'#title' => t('User registration'),
|
||||
'#collapsible' => TRUE,
|
||||
'#collapsed' => TRUE,
|
||||
);
|
||||
$form['register']['spambot_user_register_protect'] = array(
|
||||
'#type' => 'checkbox',
|
||||
'#title' => t('Protect the user registration form'),
|
||||
'#description' => t('If ticked, new user registrations will be tested if they match any known spammers and blacklisted.'),
|
||||
'#default_value' => variable_get('spambot_user_register_protect', TRUE),
|
||||
);
|
||||
$form['register']['spambot_blocked_message_email'] = array(
|
||||
'#type' => 'textarea',
|
||||
'#title' => t('User registration blocked message (blocked email address)'),
|
||||
'#rows' => 1,
|
||||
'#default_value' => variable_get('spambot_blocked_message_email', t(SPAMBOT_DEFAULT_BLOCKED_MESSAGE)),
|
||||
'#description' => t('Message to display when user registration is blocked due to email address. <br />Showing a specific reason why registration was blocked may make spambot easier to circumvent.<br />The following tokens are available: @email %email @username %username @ip %ip'),
|
||||
);
|
||||
$form['register']['spambot_blocked_message_username'] = array(
|
||||
'#type' => 'textarea',
|
||||
'#title' => t('User registration blocked message (blocked username)'),
|
||||
'#rows' => 1,
|
||||
'#default_value' => variable_get('spambot_blocked_message_username', t(SPAMBOT_DEFAULT_BLOCKED_MESSAGE)),
|
||||
'#description' => t('Message to display when user registration is blocked due to username.'),
|
||||
);
|
||||
$form['register']['spambot_blocked_message_ip'] = array(
|
||||
'#type' => 'textarea',
|
||||
'#title' => t('User registration blocked message (blocked ip address)'),
|
||||
'#rows' => 1,
|
||||
'#default_value' => variable_get('spambot_blocked_message_ip', t(SPAMBOT_DEFAULT_BLOCKED_MESSAGE)),
|
||||
'#description' => t('Message to display when user registration is blocked due to ip address.'),
|
||||
);
|
||||
|
||||
$sleep_options = array(0 => t('Don\'t delay'), 1 => t('1 second'));
|
||||
|
||||
$sleep_options = array(t("Don't delay"), t('1 second'));
|
||||
foreach (array(2, 3, 4, 5, 10, 20, 30) as $num) {
|
||||
$sleep_options[$num] = t('@num seconds', array('@num' => $num));
|
||||
}
|
||||
@@ -73,21 +113,23 @@ function spambot_settings_form($form, &$form_state) {
|
||||
'#title' => t('If blacklisted, delay for'),
|
||||
'#description' => t('If an attempted user registration is blacklisted, you can choose to deliberately delay the request. This can be useful for slowing them down if they continually try to register.<br />Be careful about choosing too large a value for this as it may exceed your PHP max_execution_time.'),
|
||||
'#options' => $sleep_options,
|
||||
'#default_value' => variable_get('spambot_blacklisted_delay', 0),
|
||||
'#default_value' => variable_get('spambot_blacklisted_delay', SPAMBOT_DEFAULT_DELAY),
|
||||
);
|
||||
|
||||
// Fieldset for set up scanning of existing accounts.
|
||||
$form['existing'] = array(
|
||||
'#type' => 'fieldset',
|
||||
'#title' => t('Scan existing accounts'),
|
||||
'#description' => t('This module can also scan existing user accounts to see if they are known spammers. It works by checking user accounts with increasing uid\'s ie. user id 2, 3, 4 etc during cron.'),
|
||||
'#description' => t("This module can also scan existing user accounts to see if they are known spammers. It works by checking user accounts with increasing uid's ie. user id 2, 3, 4 etc during cron."),
|
||||
'#collapsible' => TRUE,
|
||||
'#collapsed' => TRUE,
|
||||
);
|
||||
$form['existing']['spambot_cron_user_limit'] = array(
|
||||
'#type' => 'textfield',
|
||||
'#title' => t('Maximum number of user accounts to scan per cron'),
|
||||
'#description' => t('Enter the number of user accounts to scan for each cron. If you do not want to scan existing user accounts, leave this as 0.<br />Be careful not to make this value too large, as it will slow your cron execution down and may cause your site to query www.stopforumspam.com more times than allowed each day.'),
|
||||
'#size' => 10,
|
||||
'#default_value' => variable_get('spambot_cron_user_limit', 0),
|
||||
'#default_value' => variable_get('spambot_cron_user_limit', SPAMBOT_DEFAULT_CRON_USER_LIMIT),
|
||||
);
|
||||
$form['existing']['spambot_check_blocked_accounts'] = array(
|
||||
'#type' => 'checkbox',
|
||||
@@ -107,39 +149,57 @@ function spambot_settings_form($form, &$form_state) {
|
||||
'#default_value' => variable_get('spambot_spam_account_action', SPAMBOT_ACTION_NONE),
|
||||
);
|
||||
|
||||
// Show scan status
|
||||
$last_uid = variable_get('spambot_last_checked_uid', 0);
|
||||
// Get scan status.
|
||||
$suffix = '';
|
||||
if ($last_uid) {
|
||||
$num_checked = db_select('users')->fields('users')
|
||||
->condition('uid', '1', '>')->condition('uid', $last_uid, '<=')
|
||||
->countQuery()->execute()->fetchField();
|
||||
if ($last_uid = variable_get('spambot_last_checked_uid', 0)) {
|
||||
$num_checked = db_select('users', 'u')
|
||||
->fields('u', array('uid'))
|
||||
->condition('u.uid', 1, '>')
|
||||
->condition('u.uid', $last_uid, '<=')
|
||||
->countQuery()
|
||||
->execute()
|
||||
->fetchField();
|
||||
|
||||
$num_left = db_select('users')->fields('users')
|
||||
->condition('uid', '1', '>')->condition('uid', $last_uid, '>')
|
||||
->countQuery()->execute()->fetchField();
|
||||
$num_left = db_select('users', 'u')
|
||||
->fields('u', array('uid'))
|
||||
->condition('u.uid', 1, '>')
|
||||
->condition('u.uid', $last_uid, '>')
|
||||
->countQuery()
|
||||
->execute()
|
||||
->fetchField();
|
||||
|
||||
$last_uid = db_select('users')->fields('users', array('uid'))
|
||||
->condition('uid', '1', '>')->condition('uid', $last_uid, '<=')
|
||||
->orderBy('uid', 'DESC')->range(0, 1)
|
||||
->execute()->fetchField();
|
||||
|
||||
$account = user_load((int) $last_uid);
|
||||
$suffix = '<br />' . t('The last checked user account is: !account (uid @uid)', array('!account' => l(check_plain($account->name), 'user/' . $account->uid), '@uid' => $account->uid));
|
||||
$last_uid = db_select('users', 'u')
|
||||
->fields('u', array('uid'))
|
||||
->condition('u.uid', 1, '>=')
|
||||
->condition('u.uid', $last_uid, '<=')
|
||||
->orderBy('u.uid', 'DESC')
|
||||
->range(0, 1)
|
||||
->execute()
|
||||
->fetchField();
|
||||
|
||||
$account = user_load($last_uid);
|
||||
$suffix = '<br />';
|
||||
$suffix .= t('The last checked user account is: !account (uid %uid)', array(
|
||||
'!account' => l($account->name, 'user/' . $account->uid),
|
||||
'%uid' => $account->uid,
|
||||
));
|
||||
}
|
||||
else {
|
||||
$num_checked = 0;
|
||||
$num_left = db_select('users')->fields('users')->condition('uid', 1, '>')
|
||||
->countQuery()->execute()->fetchField();
|
||||
$num_left = db_select('users')
|
||||
->fields('users')
|
||||
->condition('uid', 1, '>')
|
||||
->countQuery()
|
||||
->execute()
|
||||
->fetchField();
|
||||
}
|
||||
|
||||
$text = t('Accounts checked: @checked, Accounts remaining: @remaining', array('@checked' => $num_checked, '@remaining' => $num_left));
|
||||
$text = t('Accounts checked: %checked, Accounts remaining: %remaining', array('%checked' => $num_checked, '%remaining' => $num_left));
|
||||
$form['existing']['message'] = array(
|
||||
'#type' => 'fieldset',
|
||||
'#title' => t('Scan status'),
|
||||
'#description' => $text . $suffix,
|
||||
);
|
||||
|
||||
$form['existing']['spambot_last_checked_uid'] = array(
|
||||
'#type' => 'textfield',
|
||||
'#title' => t('Continue scanning after this user id'),
|
||||
@@ -148,6 +208,49 @@ function spambot_settings_form($form, &$form_state) {
|
||||
'#default_value' => $last_uid,
|
||||
);
|
||||
|
||||
// Fieldset for set up messages which will be displayed for blocked users.
|
||||
$form['messages'] = array(
|
||||
'#type' => 'fieldset',
|
||||
'#title' => t('Blocked messages'),
|
||||
'#collapsible' => TRUE,
|
||||
'#collapsed' => TRUE,
|
||||
);
|
||||
$form['messages']['spambot_blocked_message_email'] = array(
|
||||
'#type' => 'textarea',
|
||||
'#title' => t('User registration blocked message (blocked email address)'),
|
||||
'#rows' => 1,
|
||||
'#default_value' => variable_get('spambot_blocked_message_email', SPAMBOT_DEFAULT_BLOCKED_MESSAGE),
|
||||
'#description' => t('Message to display when user action is blocked due to email address. <br />Showing a specific reason why registration was blocked may make spambot easier to circumvent.<br />The following tokens are available: <em>@email %email @username %username @ip %ip</em>'),
|
||||
);
|
||||
$form['messages']['spambot_blocked_message_username'] = array(
|
||||
'#type' => 'textarea',
|
||||
'#title' => t('User registration blocked message (blocked username)'),
|
||||
'#rows' => 1,
|
||||
'#default_value' => variable_get('spambot_blocked_message_username', SPAMBOT_DEFAULT_BLOCKED_MESSAGE),
|
||||
'#description' => t('Message to display when user action is blocked due to username.<br />The following tokens are available: <em>@email %email @username %username @ip %ip</em>'),
|
||||
);
|
||||
$form['messages']['spambot_blocked_message_ip'] = array(
|
||||
'#type' => 'textarea',
|
||||
'#title' => t('User registration blocked message (blocked ip address)'),
|
||||
'#rows' => 1,
|
||||
'#default_value' => variable_get('spambot_blocked_message_ip', SPAMBOT_DEFAULT_BLOCKED_MESSAGE),
|
||||
'#description' => t('Message to display when user action is blocked due to ip address.<br />The following tokens are available: <em>@email %email @username %username @ip %ip</em>'),
|
||||
);
|
||||
|
||||
// Fieldset for configure log rules.
|
||||
$form['logging'] = array(
|
||||
'#type' => 'fieldset',
|
||||
'#title' => t('Log information'),
|
||||
'#collapsible' => TRUE,
|
||||
'#collapsed' => TRUE,
|
||||
);
|
||||
$form['logging']['spambot_log_blocked_registration'] = array(
|
||||
'#type' => 'checkbox',
|
||||
'#title' => t('Log information about blocked registrations into Drupal log'),
|
||||
'#default_value' => variable_get('spambot_log_blocked_registration', TRUE),
|
||||
);
|
||||
|
||||
// StopFormSpam API key.
|
||||
$form['spambot_sfs_api_key'] = array(
|
||||
'#type' => 'textfield',
|
||||
'#title' => t('www.stopforumspam.com API key'),
|
||||
|
||||
Reference in New Issue
Block a user