/drupal7/sites/all/modules/captcha/captcha.module - Diff - Club Drupal - Forge Centrale Marseille

Révision ac1bc5de

Ajouté par Assos Assos il y a plus de 9 ans

ID ac1bc5de3c1dbb439e582632cecfbfef84d14319
Parent 6bd64071
Enfant aceb9ae7

Weekly update of contrib modules

           ) . '</p>';
           $output .= '<p>' . t('CAPTCHA is a trademark of Carnegie Mellon University.') . '</p>';
           return $output;
         case 'admin/config/people/captcha':
         case 'admin/config/people/captcha/captcha':
         case 'admin/config/people/captcha/captcha/settings':
-...
+    }
     /**
      * Implementation of hook_menu().
      * Implements of hook_menu().
      */
     function captcha_menu() {
       $items = array();
       // main configuration page of the basic CAPTCHA module
       // Main configuration page of the basic CAPTCHA module.
       $items['admin/config/people/captcha'] = array(
         'title' => 'CAPTCHA',
         'description' => 'Administer how and where CAPTCHAs are used.',
-...
         'access arguments' => array('administer CAPTCHA settings'),
         'type' => MENU_NORMAL_ITEM,
       );
       // the default local task (needed when other modules want to offer
       // alternative CAPTCHA types and their own configuration page as local task)
       // The default local task (needed when other modules want to offer,
       // alternative CAPTCHA types and their own configuration page as local task).
       $items['admin/config/people/captcha/captcha'] = array(
         'title' => 'CAPTCHA',
         'access arguments' => array('administer CAPTCHA settings'),
-...
+    }
     /**
      * Implementation of hook_permission().
      * Implements of hook_permission().
      */
     function captcha_permission() {
       return array(
-...
+    }
     /**
      * Implementation of hook_theme().
      * Implements of hook_theme().
      */
     function captcha_theme() {
       return array(
-...
+    }
     /**
      * Implementation of hook_cron().
      * Implements of hook_cron().
+     *
      * Remove old entries from captcha_sessions table.
      */
     function captcha_cron() {
       // Remove challenges older than 1 day.
       db_delete('captcha_sessions')
         ->condition('timestamp', REQUEST_TIME - 60*60*24, '<')
         ->condition('timestamp', REQUEST_TIME - 60 * 60 * 24, '<')
         ->execute();
+    }
     /**
      * Implementation of hook_element_info().
      * Implements of hook_element_info().
      */
     function captcha_element_info() {
       // Define the CAPTCHA form element with default properties.
       $captcha_element = array(
         '#input' => TRUE,
         '#process' => array('captcha_element_process'),
         // The type of challenge: e.g. 'default', 'none', 'captcha/Math', 'image_captcha/Image', ...
         // The type of challenge: e.g. 'default', 'none', 'captcha/Math', 'image_captcha/Image'.
         '#captcha_type' => 'default',
         '#default_value' => '',
         // CAPTCHA in admin mode: presolve the CAPTCHA and always show it (despite previous successful responses).
-...
         'captcha_sid' => $captcha_sid,
       );
       if (_captcha_required_for_user($captcha_sid, $this_form_id) || $element['#captcha_admin_mode']) {
         // Generate a CAPTCHA and its solution
         // (note that the CAPTCHA session ID is given as third argument).
-...
           // The selected module did not return what we expected: log about it and quit.
           watchdog('CAPTCHA',
             'CAPTCHA problem: unexpected result from hook_captcha() of module %module when trying to retrieve challenge type %type for form %form_id.',
             array('%type' => $captcha_type_challenge, '%module' => $captcha_type_module, '%form_id' => $this_form_id),
             array(
               '%type' => $captcha_type_challenge,
               '%module' => $captcha_type_module,
               '%form_id' => $this_form_id,
             ),
             WATCHDOG_ERROR);
           return $element;
+        }
-...
       return $element;
+    }
     /**
      * Theme function for a CAPTCHA element.
+     *
-...
+      }
+    }
     /**
      * Implementation of hook_form_alter().
      * Implements of hook_form_alter().
+     *
      * This function adds a CAPTCHA to forms for untrusted users if needed and adds
      * CAPTCHA administration links for site administrators if this option is enabled.
-...
         // Get CAPTCHA type and module for given form_id.
         $captcha_point = captcha_get_form_id_setting($form_id);
         if ($captcha_point && $captcha_point->captcha_type) {
         if ($captcha_point && !empty($captcha_point->captcha_type)) {
           module_load_include('inc', 'captcha');
           // Build CAPTCHA form element.
           $captcha_element = array(
-...
         module_load_include('inc', 'captcha');
         $captcha_point = captcha_get_form_id_setting($form_id);
         // For administrators: show CAPTCHA info and offer link to configure it
         // For administrators: show CAPTCHA info and offer link to configure it.
         $captcha_element = array(
           '#type' => 'fieldset',
           '#title' => t('CAPTCHA'),
-...
       // Add a warning about caching on the Perfomance settings page.
       if ($form_id == 'system_performance_settings') {
         $icon = theme('image', array('path' => 'misc/watchdog-warning.png', 'width' => 18, 'height' => 18, 'alt' => t('warning'), 'title' => t('warning')));
         $icon = theme(
           'image',
           array(
             'path' => 'misc/watchdog-warning.png',
             'width' => 18,
             'height' => 18,
             'alt' => t('warning'),
             'title' => t('warning'),
+          )
         );
         $form['caching']['captcha'] = array(
           '#type' => 'item',
           '#title' => t('CAPTCHA'),
-...
     /**
      * CAPTCHA validation function to tests strict equality.
      * @param $solution the solution of the test.
      * @param $response the response to the test.
      * @return TRUE when strictly equal, FALSE otherwise.
+     *
      * @param string $solution
      *   the solution of the test.
+     *
      * @param string $response
      *   the response to the test.
+     *
      * @return bool
      *   TRUE when equal (ignoring spaces), FALSE otherwise.
      */
     function captcha_validate_strict_equality($solution, $response) {
       return $solution === $response;
-...
     /**
      * CAPTCHA validation function to tests case insensitive equality.
      * @param $solution the solution of the test.
      * @param $response the response to the test.
      * @return TRUE when case insensitive equal, FALSE otherwise.
+     *
      * @param string $solution
      *   the solution of the test.
+     *
      * @param string $response
      *   the response to the test.
+     *
      * @return bool
      *   TRUE when equal (ignoring spaces), FALSE otherwise.
      */
     function captcha_validate_case_insensitive_equality($solution, $response) {
       return drupal_strtolower($solution) === drupal_strtolower($response);
-...
     /**
      * CAPTCHA validation function to tests equality while ignoring spaces.
      * @param $solution the solution of the test.
      * @param $response the response to the test.
      * @return TRUE when equal (ignoring spaces), FALSE otherwise.
+     *
      * @param string $solution
      *   the solution of the test.
+     *
      * @param string $response
      *   the response to the test.
+     *
      * @return bool
      *   TRUE when equal (ignoring spaces), FALSE otherwise.
      */
     function captcha_validate_ignore_spaces($solution, $response) {
       return preg_replace('/\s/', '', $solution) === preg_replace('/\s/', '', $response);
-...
     /**
      * CAPTCHA validation function to tests case insensitive equality while ignoring spaces.
      * @param $solution the solution of the test.
      * @param $response the response to the test.
      * @return TRUE when equal (ignoring spaces), FALSE otherwise.
+     *
      * @param string $solution
      *   the solution of the test.
+     *
      * @param string $response
      *   the response to the test.
+     *
      * @return bool
      *   TRUE when equal (ignoring spaces), FALSE otherwise.
      */
     function captcha_validate_case_insensitive_ignore_spaces($solution, $response) {
       return preg_replace('/\s/', '', drupal_strtolower($solution)) === preg_replace('/\s/', '', drupal_strtolower($response));
+    }
     /**
      * Helper function for getting the posted CAPTCHA info (posted form_id and
      * CAPTCHA sessions ID) from a form in case it is posted.
      * Helper function for getting the posted CAPTCHA info (posted form_id and CAPTCHA sessions ID) from a form in case it is posted.
+     *
      * This function hides the form processing mess for several use cases an
      * browser bug workarounds.
-...
+     *
      * @todo for Drupal 7 version: is this IE7 workaround still needed?
+     *
      * @param $element the CAPTCHA element.
      * @param $form_state the form state structure to extract the info from.
      * @param $this_form_id the form ID of the form we are currently processing
      * @param array $element
      *   the CAPTCHA element.
+     *
      * @param array $form_state
      *   the form state structure to extract the info from.
+     *
      * @param string $this_form_id
      *   the form ID of the form we are currently processing
      *     (which is not necessarily the form that was posted).
+     *
      * @return an array with $posted_form_id and $post_captcha_sid (with NULL values
      * @return array
      *   an array with $posted_form_id and $post_captcha_sid (with NULL values
      *     if the values could not be found, e.g. for a fresh form).
      */
     function _captcha_get_posted_captcha_info($element, $form_state, $this_form_id) {
-...
         // from the post data.
         // Because we possibly use raw post data here,
         // we should be extra cautious and filter this data.
         $posted_form_id = isset($form_state['input']['form_id']) ?
           preg_replace("/[^a-z0-9_]/", "", (string) $form_state['input']['form_id'])
           : NULL;
         $posted_captcha_sid = isset($form_state['input']['captcha_sid']) ?
           (int) $form_state['input']['captcha_sid']
           : NULL;
         $posted_captcha_token = isset($form_state['input']['captcha_token']) ?
           preg_replace("/[^a-zA-Z0-9]/", "", (string) $form_state['input']['captcha_token'])
           : NULL;
         $posted_form_id = isset($form_state['input']['form_id']) ? preg_replace("/[^a-z0-9_]/", "", (string) $form_state['input']['form_id']) : NULL;
         $posted_captcha_sid = isset($form_state['input']['captcha_sid']) ? (int) $form_state['input']['captcha_sid'] : NULL;
         $posted_captcha_token = isset($form_state['input']['captcha_token']) ? preg_replace("/[^a-zA-Z0-9]/", "", (string) $form_state['input']['captcha_token']) : NULL;
         if ($posted_form_id == $this_form_id) {
           // Check if the posted CAPTCHA token is valid for the posted CAPTCHA
-...
         // Get CAPTCHA validate function or fall back on strict equality.
         $captcha_validate = $element['#captcha_validate'];
         if (!function_exists($captcha_validate)) {
            $captcha_validate = 'captcha_validate_strict_equality';
           $captcha_validate = 'captcha_validate_strict_equality';
+        }
         // Check the response with the CAPTCHA validation function.
         // Apart from the traditional expected $solution and received $response,
-...
             ->condition('csid', $csid)
             ->expression('attempts', 'attempts + 1')
             ->execute();
           // set form error
           // Set form error.
           form_set_error('captcha_response', t('The answer you entered for the CAPTCHA was not correct.'));
           // update wrong response counter
           // Update wrong response counter.
           if (variable_get('captcha_enable_stats', FALSE)) {
             variable_set('captcha_wrong_response_counter', variable_get('captcha_wrong_response_counter', 0) + 1);
+          }
           // log to watchdog if needed
           // Log to watchdog if needed.
           if (variable_get('captcha_log_wrong_responses', FALSE)) {
             watchdog('CAPTCHA',
               '%form_id post blocked by CAPTCHA module: challenge %challenge (by module %module), user answered "@response", but the solution was "@solution".',
               array('%form_id' => $form_id,
               array(
                 '%form_id' => $form_id,
                 '@response' => $captcha_response, '@solution' => $solution,
                 '%challenge' => $captcha_info['captcha_type'], '%module' => $captcha_info['module'],
               ),
-...
      * This encompasses tasks that should happen after the general FAPI processing
      * (building, submission and validation) but before rendering (e.g. storing the solution).
+     *
      * @param $element the CAPTCHA form element
      * @return the manipulated element
      * @param array $element
      *   the CAPTCHA form element
+     *
      * @return array
      *   the manipulated element
      */
     function captcha_pre_render_process($element) {
       module_load_include('inc', 'captcha');
-...
       // Get form and CAPTCHA information.
       $captcha_info = $element['#captcha_info'];
       $form_id = $captcha_info['form_id'];
       $captcha_sid = (int)($captcha_info['captcha_sid']);
       $captcha_sid = (int) ($captcha_info['captcha_sid']);
       // Check if CAPTCHA is still required.
       // This check is done in a first phase during the element processing
       // (@see captcha_process), but it is also done here for better support
-...
       switch ($op) {
         case 'list':
           return array('Math');
           break;
         case 'generate':
           if ($captcha_type == 'Math') {
-...
+    }
     /**
      * Implements hook_modules_enabled.
      * Implements hook_modules_enabled().
      */
     function captcha_modules_enabled() {
       // When new modules are enabled: clear the CAPTCHA placement cache, so that

Formats disponibles : Unified diff

Projet

Général

Profil

Club Drupal

Révision ac1bc5de

Ajouté par Assos Assos il y a plus de 9 ans