diff --git a/mollom.captcha.tpl.php b/mollom.captcha.tpl.php
new file mode 100644
index 0000000..26f29e7
--- /dev/null
+++ b/mollom.captcha.tpl.php
@@ -0,0 +1,140 @@
+ array('url' => $captcha_url),
+ 'external' => TRUE,
+));
+$verify_audio = $audio_enabled ? t('Switch to audio verification') : '';
+$verify_image = t('Switch to image verification');
+$instructions_image = t("Type the characters you see in the picture; if you can't read them, submit the form and a new image will be generated. Not case sensitive.");
+$instructions_audio = 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,
+));
+$image_alt_text = t('Type the characters you see in this picture.');
+?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
';
- $output .= ' ';
-
- $output = '' . $output . ' ';
- $output .= ' (' . t('verify using image') . ' )';
- break;
-
- case 'image':
- $captcha = theme('image', array('path' => $url, 'alt' => t('Type the characters you see in this picture.'), 'getsize' => FALSE));
- $output = '' . $captcha . ' ';
- $output .= ' (' . t('verify using audio') . ' )';
- break;
- }
-
- return $output;
+ return theme('mollom_captcha', array(
+ 'captcha_type' => $form_state['mollom']['captcha_type'],
+ 'captcha_url' => $url,
+ 'audio_enabled' => variable_get('mollom_audio_captcha_enabled', 1),
+ ));
+}
+
+/**
+ * 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) {
+ $libraries = &drupal_static(__FUNCTION__);
+ 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.
+ $profile = drupal_get_path('profile', drupal_get_profile());
+ $config = conf_path();
+ $search = array(
+ 'libraries',
+ "$profile/libraries",
+ "sites/all/libraries",
+ "$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;
}
/**
diff --git a/tests/mollom.test b/tests/mollom.test
index 4014608..ea9787e 100644
--- a/tests/mollom.test
+++ b/tests/mollom.test
@@ -553,7 +553,7 @@ class MollomWebTestCase extends DrupalWebTestCase {
));
$this->assert(!empty($inputs[0]) && !empty($labels[0]), 'Required CAPTCHA field found.');
- $image = $this->xpath('//img[@alt=:alt]', array(':alt' => t('Type the characters you see in this picture.')));
+ $image = $this->xpath('//img[@alt=:alt]', array(':alt' => t("Type the characters you see in this picture.")));
$this->assert(!empty($image), 'CAPTCHA image found.');
}
@@ -564,7 +564,7 @@ class MollomWebTestCase extends DrupalWebTestCase {
$this->assertNoText($this->unsure_message);
$this->assertNoText($this->incorrect_message);
$this->assertNoFieldByXPath('//input[@type="text"][@name="mollom[captcha]"]', '', 'CAPTCHA field not found.');
- $image = $this->xpath('//img[@alt=:alt]', array(':alt' => t('Type the characters you see in this picture.')));
+ $image = $this->xpath('//img[@alt=:alt]', array(':alt' => t("Type the characters you see in this picture.")));
$this->assert(empty($image), 'CAPTCHA image not found.');
}
@@ -4859,6 +4859,20 @@ class MollomCaptchaTestCase extends MollomWebTestCase {
$response = drupal_json_decode($out);
$this->assertTrue($response['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'));
+ }
}
/**