diff --git a/mollom-captcha-player.swf b/mollom-captcha-player.swf index 938e0135dd22f23843f45064a36aa589b398fffa..85143484a60d0d20f0532f443e13952641e64f77 100644 GIT binary patch literal 5986 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 Qft9~HVt>x|zqqPWWJNn)NB{r; literal 1378 zcmV-o1)cgsS5pZI2mkJ z)8!>eVW!<#c64`kot@TTLfk~7Au;hsjX{M({}>EEl)@hqlllW6m?ka;F(hJ0G{zVb zY9fh5ll9I_0juH0@-@Scz+u>e#(dA;O2kPn|b;ZE`SKoYM`2GE7UpstK zMigI|zZ(1qg0Q%_Sh>8+1mG|ocncTNeLlJAHuD8Ad9a*ac9^>df% zE0^E-et?DP5xXuu0D%V`Tsp|vNU|FMu&j`z=) zW?qMd@G0Kbd&1)%NI;#{jo$9Qrn?=u_{7g|Du=c*; zu>r%#8@9piQ8eA}AX8e=@*(WW&uVHSs}(#CT>6q)u8>t7!#ia!N3GB7jFELEO+(X< z@x}a%p7J_mIW?sze9}50(-}qA)vV995{|)Xx@LMUhD6`^zQnFRpK6KPrRb@wYPiOx zo>ZsJWnpP8YpO=kGnCCgGidLtj;UrMqh(Y5$M-5Z)iat`QmQemr}LbV&zqj?ecMw| z42rPsug#cdp{J`$N#&>1&gp!vt1sEzwMmk;c1_JtT1~%~GD}IZW<^$d?q?;u@;q5E zG*gYQJlyH5P85l}Zqh8P#+sF&VV$Z{rcG^Db%1sMLQ?rZn#9Xn)*xFcAY+WoKYmP;uolG^4Zo%W_eEzCxF%S%GB*+kkBMeW_MOZgMfv_IJ zdkOC&=qG#?afyTv5Lb}!A;O0VA0Zeeq?X_+!o~>J5v(WJP=^H96Wl4_lUKBSl1y*ISm#!!TJrRt@xsA*@%t zgk|Yq+gFl`jiq1?ttFIWoP|B&E_VonVU)>B8Mlg)k#ahkt{IGAy4C_85md}#hcCS< zBgjJIxwZh+*D4DgEf2PME=U^{y&Kwyag4j$;y4oGEgv#v%rXa1iHWTMvRh`-b+R~C z&sg9%bYWb)4`yvJYlB6AvUEi{3~krir1l&(xS1i`@E%^khSlsEz#udN6N0tChJa-` zuc%oOUb7=?vO>F(!*bdmqyp(OwvNu;K(no}Nft($&_b0beU`crA1Yq@U1rm9IY70Q zsWI3Lir variable_get('mollom_log_minimum_severity', WATCHDOG_WARNING), ); $form['mollom_advanced']['mollom_audio_captcha_enabled'] = array( + '#type' => 'checkbox', '#title' => t('Enable audio CAPTCHAs.'), '#description' => t('Allows users to switch to an audio verification using the NATO alphabet. This may not be appropriate for non-English language sites.', array( '!faq-url' => 'https://mollom.com/faq/mollom-audible-captcha-language', diff --git a/mollom.captcha.audio.tpl.php b/mollom.captcha.audio.tpl.php new file mode 100644 index 0000000000000000000000000000000000000000..d492cd7eb15414a5d66ae9f458b5ec60b6078c17 --- /dev/null +++ b/mollom.captcha.audio.tpl.php @@ -0,0 +1,123 @@ + array('url' => $captcha_url), + 'external' => TRUE, +)); +$switch_verify = t('Switch to image verification'); +$instructions = t('Enter only the first letter of each word you hear. If you are having trouble listening in your browser, you can download the audio to listen on your device.', array( + '@captcha-url' => $captcha_url, +)); +$unsupported = t('Your system does not support our audio playback verification. Please download this verification to listen on your device.', array( + '@captcha-url' => $captcha_url, +)); +?> + + + +
+
+ + + + + +
+
+ +
+ + + + +
.
+
diff --git a/mollom.captcha.image.tpl.php b/mollom.captcha.image.tpl.php new file mode 100644 index 0000000000000000000000000000000000000000..9ec62e91eadf7e85e0d8f4385305a247404008cd --- /dev/null +++ b/mollom.captcha.image.tpl.php @@ -0,0 +1,21 @@ + + + + +
  .
diff --git a/mollom.css b/mollom.css index e1089b9db88a69d44e8c40422d90cd145ee8fff6..60723989532929f134eb89b2980b5db82c8b0c5c 100644 --- a/mollom.css +++ b/mollom.css @@ -15,3 +15,13 @@ img.mollom-fba { width: 1px; height: 1px; } + +/* Allow CAPTCHA rendering to take full form width. */ +.form-item-mollom-captcha label[for="edit-mollom-captcha"] { + float: none; +} + +/* Accessibilty focus helper for audio CAPTCHA. */ +.mollom_captcha_flash_player:focus{ + border: yellow 2px solid; +} diff --git a/mollom.js b/mollom.js index 54c0dfa1e1caac256c66f0f17b1c10115df73df5..cec999288977269325c7e4845ed260915267a49f 100644 --- a/mollom.js +++ b/mollom.js @@ -52,7 +52,15 @@ function getMollomCaptcha() { // Add an onclick-event handler for the new link. Drupal.attachBehaviors(context); // Focus on the CAPTCHA input. - $('input[name="mollom[captcha]"]', context).focus(); + if (newCaptchaType == 'image') { + $('input[name="mollom[captcha]"]', context).focus(); + } else { + // Focus on audio player. + // Fallback player code is responsible for setting focus upon embed. + if ($('#mollom_captcha_audio').is(":visible")) { + $('#mollom_captcha_audio').focus(); + } + } } }); return false; diff --git a/mollom.module b/mollom.module index 3b8fff70cc8ae9491cb8f654642491ac24bcb16a..22c7c2af8073e5c990590a82edf20c4538928722 100644 --- a/mollom.module +++ b/mollom.module @@ -1702,6 +1702,7 @@ function mollom_elements() { * Implements hook_theme(). */ function mollom_theme() { + $base_path = base_path() . drupal_get_path('module', 'mollom'); return array( 'mollom' => array( 'arguments' => array('element' => NULL), @@ -1710,6 +1711,21 @@ function mollom_theme() { 'arguments' => array('form' => NULL), 'file' => 'mollom.admin.inc', ), + 'mollom_captcha_audio' => array( + 'arguments' => array( + 'captcha_url' => NULL, + 'flash_fallback_player' => $base_path . '/mollom-captcha-player.swf', + ), + 'template' => 'mollom.captcha.audio', + ), + 'mollom_captcha_image' => array( + 'arguments' => array( + 'captcha_url' => NULL, + 'audio_enabled' => TRUE, + ), + 'template' => 'mollom.captcha.image', + ), + ); } @@ -1858,10 +1874,9 @@ function mollom_process_mollom($element, $input, &$form_state, &$complete_form) // assigned as Boolean #solved = TRUE element property when solved correctly. $element['captcha'] = array( '#type' => 'textfield', - '#title' => t('Word verification'), + '#title' => t('verification'), '#size' => 10, '#default_value' => '', - '#description' => t("Type the characters you see in the picture above; if you can't read them, submit the form and a new image will be generated. Not case sensitive."), ); // Disable browser autocompletion, unless testing mode is enabled, in which // case autocompletion for 'correct' and 'incorrect' is handy. @@ -2044,6 +2059,8 @@ function mollom_form_add_captcha(&$element, &$form_state) { if (!empty($captcha)) { $element['captcha']['#access'] = TRUE; $element['captcha']['#field_prefix'] = $captcha; + $element['captcha']['#attributes'] = array('title' => t('Enter the characters from the verification above.')); + _mollom_attach_captcha_script($element['captcha']); // Ensure that the latest CAPTCHA ID is output as value. $element['captchaId']['#value'] = $form_state['mollom']['response']['captcha']['id']; @@ -2060,6 +2077,78 @@ function mollom_form_add_captcha(&$element, &$form_state) { } /** + * Attach SWFObject script to render element when available. + * + * @param $element + * A render element to attach the script to. + * + * @return bool + * True if the library can be found, false otherwise. + */ +function _mollom_attach_captcha_script(&$element = NULL) { + static $libraries; + if (empty($libraries['swfobject'])) { + $lib = array( + 'found' => FALSE, + ); + + // Try to load via libraries module if enabled. + if (module_exists('libraries')) { + if (($library = libraries_detect('swfoject')) && !empty($library['installed'])) { + $lib = array( + 'found' => TRUE, + 'libraries' => TRUE, + ); + } + } + if (!$lib['found']) { + // Check for SWFObject in standard library locations. + global $profile; + if (!isset($profile)) { + $profile = variable_get('install_profile', 'default'); + } + $config = conf_path(); + $search = array(); + $search[] = 'libraries'; + if (file_exists("profiles/$profile/libraries")) { + $search[] = "profiles/$profile/libraries"; + } + $search[] = 'site/all/libraries'; + if (file_exists("$config/libraries")) { + $search[] = "$config/libraries"; + } + foreach ($search as $dir) { + if (is_dir($dir) && ( + file_exists("$dir/swfobject.js") || file_exists("$dir/swfobject/swfobject.js") + )) { + $lib = array( + 'found' => TRUE, + 'libraries' => FALSE, + 'path' => file_exists("$dir/swfobject.js") ? "$dir/swfobject.js" : "$dir/swfobject/swfobject.js", + ); + break; + } + } + } + $libraries['swfobject'] = $lib; + } + if ($libraries['swfobject']['found']) { + if (isset($element)) { + if ($libraries['swfobject']['libraries']) { + $element['#attached']['libraries_load'][] = array('swfobject'); + } + else { + $element['#attached'] = array( + 'js' => array($libraries['swfobject']['path']), + ); + } + } + return TRUE; + } + return FALSE; +} + +/** * Form validation handler to perform textual analysis on submitted form values. */ function mollom_validate_analysis($form_copy, &$form_state) { @@ -2937,37 +3026,14 @@ function mollom_get_captcha(&$form_state) { return ''; } - // @todo Convert these to actual theme functions? - $output = ''; - switch ($form_state['mollom']['captcha_type']) { - case 'audio': - $source = url(base_path() . drupal_get_path('module', 'mollom') . '/mollom-captcha-player.swf', array( - 'query' => array('url' => $url), - 'external' => TRUE, - )); - $output = ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - - $output = '' . $output . ''; - $output .= ' (' . t('verify using image') . ')'; - break; - - case 'image': - $captcha = theme('image', $url, t('Type the characters you see in this picture.'), '', NULL, FALSE); - $output = '' . $captcha . ''; - $output .= ' (' . t('verify using audio') . ')'; - break; + // Theme CAPTCHA output and return. + $audio_enabled = variable_get('mollom_audio_captcha_enabled', 1); + if ($audio_enabled && $form_state['mollom']['captcha_type'] == 'audio') { + return theme('mollom_captcha_audio', $url); + } + else { + return theme('mollom_captcha_image', $url, $audio_enabled); } - - return $output; } /** diff --git a/tests/mollom.test b/tests/mollom.test index 8ef3a8d55202ee41c9cf736fd3d272ff75b506b6..328d6756f8f02ed8bda51d9e7e06618244d2eb7b 100644 --- a/tests/mollom.test +++ b/tests/mollom.test @@ -4739,6 +4739,20 @@ class MollomCaptchaTestCase extends MollomWebTestCase { // D6 can encode, but not decode its own JSON, so only check for captchaId. $this->assertText('captchaId'); } + + /** + * Tests the CAPTCHA audio enable/disable functionality. + */ + function subTestCAPTCHAAudioEnable() { + // Default should be enabled audio. + $this->drupalGet('mollom-test/form'); + $this->assertLink(t('Switch to audio verification')); + + // Verify that CAPTCHA cannot be switched when audio is disabled. + variable_set('mollom_audio_captcha_enabled', 0); + $this->drupalGet('mollom-test/form'); + $this->assertNoLink(t('Switch to audio verification')); + } } /**