diff --git a/honeypot.admin.inc b/honeypot.admin.inc deleted file mode 100644 index bffa7aa..0000000 --- a/honeypot.admin.inc +++ /dev/null @@ -1,179 +0,0 @@ - 'fieldset', - '#title' => t('Honeypot Configuration'), - '#collapsible' => TRUE, - '#collapsed' => FALSE, - ); - $form['configuration']['honeypot_protect_all_forms'] = array( - '#type' => 'checkbox', - '#title' => t('Protect all forms with Honeypot'), - '#description' => t('This will enable Honeypot protection for ALL forms on this site, regardless of the settings in the Honeypot enabled forms section below.'), - '#default_value' => variable_get('honeypot_protect_all_forms', 0), - ); - $form['configuration']['honeypot_log'] = array( - '#type' => 'checkbox', - '#title' => t('Log blocked form submissions'), - '#description' => t('Log submissions that are blocked due to Honeypot protection.'), - '#default_value' => variable_get('honeypot_log', 0), - ); - $form['configuration']['honeypot_element_name'] = array( - '#type' => 'textfield', - '#title' => t('Honeypot element name'), - '#description' => t("The name of the Honeypot form field. It's usually most effective to use a generic name like email, homepage, or name, but this should be changed if it interferes with fields that are already in your forms. Must not contain spaces or special characters."), - '#default_value' => variable_get('honeypot_element_name', 'url'), - '#required' => TRUE, - '#size' => 30, - ); - $form['configuration']['honeypot_time_limit'] = array( - '#type' => 'textfield', - '#title' => t('Honeypot time limit'), - '#description' => t('Minimum time required before form should be considered entered by a human instead of a bot. Set to 0 to disable. Page caching will be disabled if there is a form protected by time limit on the page.'), - '#default_value' => variable_get('honeypot_time_limit', 5), - '#required' => TRUE, - '#size' => 5, - '#field_suffix' => t('seconds'), - ); - - // Honeypot Enabled forms. - $form['enabled_forms'] = array( - '#type' => 'fieldset', - '#title' => t('Honeypot Enabled Forms'), - '#description' => t("Check the boxes next to individual forms on which you'd like Honeypot protection enabled."), - '#collapsible' => TRUE, - '#collapsed' => FALSE, - '#states' => array( - // Hide this fieldset when all forms are protected. - 'invisible' => array( - 'input[name="honeypot_protect_all_forms"]' => array('checked' => TRUE), - ), - ), - ); - - // Generic forms. - $form['enabled_forms']['general_forms'] = array('#markup' => '
' . t('General Forms') . '
'); - // User register form. - $form['enabled_forms']['honeypot_form_user_register_form'] = array( - '#type' => 'checkbox', - '#title' => t('User Registration form'), - '#default_value' => variable_get('honeypot_form_user_register_form', 0), - ); - // User password form. - $form['enabled_forms']['honeypot_form_user_pass'] = array( - '#type' => 'checkbox', - '#title' => t('User Password Reset form'), - '#default_value' => variable_get('honeypot_form_user_pass', 0), - ); - - // If webform.module enabled, add webforms. - if (module_exists('webform')) { - $form['enabled_forms']['honeypot_form_webforms'] = array( - '#type' => 'checkbox', - '#title' => t('Webforms (all)'), - '#default_value' => variable_get('honeypot_form_webforms', 0), - ); - } - - // If contact.module enabled, add contact forms. - if (module_exists('contact')) { - $form['enabled_forms']['contact_forms'] = array('#markup' => '
' . t('Contact Forms') . '
'); - // Sitewide contact form. - $form['enabled_forms']['honeypot_form_contact_site_form'] = array( - '#type' => 'checkbox', - '#title' => t('Sitewide Contact form'), - '#default_value' => variable_get('honeypot_form_contact_site_form', 0), - ); - // Sitewide personal form. - $form['enabled_forms']['honeypot_form_contact_personal_form'] = array( - '#type' => 'checkbox', - '#title' => t('Personal Contact forms'), - '#default_value' => variable_get('honeypot_form_contact_personal_form', 0), - ); - } - - // If profile.module enabled, add profile forms. - if (module_exists('profile')) { - $form['enabled_forms']['profile_forms'] = array('#value' => '
' . t('Profile Forms') . '
'); - $form['enabled_forms']['honeypot_form_user_profile_form'] = array( - '#type' => 'checkbox', - '#title' => t('Profile forms (all)'), - '#default_value' => variable_get('honeypot_form_user_profile_form', 0), - ); - } - - // Get node types for node forms and node comment forms. - $types = node_type_get_types(); - if (!empty($types)) { - // Node forms. - $form['enabled_forms']['node_forms'] = array('#markup' => '
' . t('Node Forms') . '
'); - foreach ($types as $type) { - $id = 'honeypot_form_' . $type->type . '_node_form'; - $form['enabled_forms'][$id] = array( - '#type' => 'checkbox', - '#title' => t('@name node form', array('@name' => $type->name)), - '#default_value' => variable_get($id, 0), - ); - } - - // Comment forms. - if (module_exists('comment')) { - $form['enabled_forms']['comment_forms'] = array('#markup' => '
' . t('Comment Forms') . '
'); - foreach ($types as $type) { - $id = 'honeypot_form_comment_node_' . $type->type . '_form'; - $form['enabled_forms'][$id] = array( - '#type' => 'checkbox', - '#title' => t('@name comment form', array('@name' => $type->name)), - '#default_value' => variable_get($id, 0), - ); - } - } - } - - // Add our own submit handler to clear honeypot's form cache on save. - $form['#submit'][] = 'honeypot_admin_form_submit'; - - return system_settings_form($form); -} - -/** - * Validate the admin form. - */ -function honeypot_admin_form_validate($form, &$form_state) { - // Make sure the time limit is a positive integer or 0. - $time_limit = $form_state['values']['honeypot_time_limit']; - if ((is_numeric($time_limit) && $time_limit > 0) || $time_limit === '0') { - if (ctype_digit($time_limit)) { - // Good to go. - } - else { - form_set_error('honeypot_time_limit', t("The time limit must be a positive integer or 0.")); - } - } - else { - form_set_error('honeypot_time_limit', t("The time limit must be a positive integer or 0.")); - } - - // Make sure Honeypot element name only contains A-Z, 0-9. - if (!preg_match("/^[-_a-zA-Z0-9]+$/", $form_state['values']['honeypot_element_name'])) { - form_set_error('honeypot_element_name', t("The element name cannot contain spaces or other special characters.")); - } -} - -/** - * Clear the honeypot form cache on submit. - */ -function honeypot_admin_form_submit($form, &$form_state) { - cache_clear_all('honeypot_protected_forms', 'cache'); -} diff --git a/lib/Drupal/honeypot/HoneypotSettingsController.php b/lib/Drupal/honeypot/HoneypotSettingsController.php index 1d582d6..2641900 100644 --- a/lib/Drupal/honeypot/HoneypotSettingsController.php +++ b/lib/Drupal/honeypot/HoneypotSettingsController.php @@ -57,9 +57,10 @@ class HoneypotSettingsController implements FormInterface { $form['configuration']['protect_all_forms'] = array( '#type' => 'checkbox', '#title' => t('Protect all forms with Honeypot'), - '#description' => t('This will enable Honeypot protection for ALL forms on this site, regardless of the settings in the Honeypot enabled forms section below.'), + '#description' => t('Enable Honeypot protection for ALL forms on this site (it is best to only enable Honeypot for the forms you need below).'), '#default_value' => config('honeypot.settings')->get('protect_all_forms'), ); + $form['configuration']['protect_all_forms']['#description'] .= '
' . t('Page caching will be disabled on any page where a form is present if the Honeypot time limit is not set to 0.'); $form['configuration']['log'] = array( '#type' => 'checkbox', '#title' => t('Log blocked form submissions'), @@ -77,12 +78,13 @@ class HoneypotSettingsController implements FormInterface { $form['configuration']['time_limit'] = array( '#type' => 'textfield', '#title' => t('Honeypot time limit'), - '#description' => t('Minimum time required before form should be considered entered by a human instead of a bot. Set to 0 to disable. Page caching will be disabled if there is a form protected by time limit on the page.'), + '#description' => t('Minimum time required before form should be considered entered by a human instead of a bot. Set to 0 to disable.'), '#default_value' => config('honeypot.settings')->get('time_limit'), '#required' => TRUE, '#size' => 5, '#field_suffix' => t('seconds'), ); + $form['configuration']['time_limit']['#description'] .= '
' . t('Page caching will be disabled if there is a form protected by time limit on the page.'); // Honeypot Enabled forms. $form_settings = config('honeypot.settings')->get('form_settings');