Index: mollom.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.pages.inc,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 mollom.pages.inc
--- mollom.pages.inc	9 Jan 2010 14:45:24 -0000	1.1.2.7
+++ mollom.pages.inc	30 Jan 2010 15:45:16 -0000
@@ -13,20 +13,56 @@
  */
 function mollom_captcha_js($type, $session_id) {
   $output = '';
+  $data = array('author_ip' => ip_address(), 'session_id' => $session_id);
 
-  if ($type == 'audio') {
-    $response = mollom('mollom.getAudioCaptcha', array('author_ip' => ip_address(), 'session_id' => $session_id));
-    if ($response) {
-      $output = '<a href="http://mollom.com" class="mollom-captcha"><embed src="' . check_plain($response['url']) . '" autostart="true" width="120" height="30" /></a>';
-      $output .= ' (<a href="#" class="mollom-image-captcha">' . t('use image CAPTCHA') . '</a>)';
-    }
-  }
-  elseif ($type == 'image') {
-    $response = mollom('mollom.getImageCaptcha', array('author_ip' => ip_address(), 'session_id' => $session_id));
-    if ($response) {
-      $output = '<a href="http://mollom.com" class="mollom-captcha"><img src="' . check_plain(url($response['url'])) . '" alt="Mollom CAPTCHA" /></a>';
-      $output .= ' (<a href="#" class="mollom-audio-captcha">' . t('play audio CAPTCHA') . '</a>)';
-    }
+  switch ($type) {
+    case 'audio':
+      $response = mollom('mollom.getAudioCaptcha', $data);
+      if ($response) {
+        $url = check_plain($response['url']);
+        // OBJECT is used by IE.
+        // 'type' attribute required to make IE apply proprietary PARAMs below.
+        // @todo Windows Media Player on Mac may require application/x-mplayer2.
+        // @see https://www.microsoft.com/windows/windowsmedia/howto/articles/macicp.aspx
+        $output = '<object type="audio/mpeg" width="80" height="30">';
+        // According to Microsoft's documentation from 2003, 'FileName' needs to
+        // be specified before all other parameters.
+        $output .= '<param name="FileName" value="' . $url . '" />';
+        $output .= '<param name="src" value="' . $url . '" />';
+        // Auto-start playback.
+        $output .= '<param name="autoplay" value="true" />';
+        // Display controls.
+        $output .= '<param name="ShowControls" value="true" />';
+        // Hide mute and volume control.
+        $output .= '<param name="ShowAudioControls" value="false" />';
+        // Hide previous, next, skip, etc.
+        $output .= '<param name="ShowPositionControls" value="false" />';
+        // Hide track seeker.
+        $output .= '<param name="ShowTracker" value="false" />';
+        // EMBED is used by all other browsers than IE.
+        // @todo audio/mpeg is the usual mime-type for mp3 files, but audio/mp3
+        //   may be supported by more browsers. Mollom servers currently deliver
+        //   the file as audio/mp3, but it may be possible that browsers support
+        //   audio/x-mp3.
+        // @see http://realdev1.realise.com/rossa/rendertest/mp3.html
+        // @see http://www.boutell.com/newfaq/creating/audio.html (bottom)
+        $output .= '<embed src="' . $url . '" type="audio/mpeg" autostart="true" width="80" height="30" />';
+        $output .= '</object>';
+
+        $output = '<a href="http://mollom.com" class="mollom-captcha">' . $output . '</a>';
+        $output .= ' (<a href="#" class="mollom-image-captcha">' . t('use image CAPTCHA') . '</a>)';
+      }
+      break;
+
+    case 'image':
+      $response = mollom('mollom.getImageCaptcha', $data);
+      if ($response) {
+        $output .= '<img src="' . check_plain(url($response['url'])) . '" alt="Mollom CAPTCHA" />';
+
+        $output = '<a href="http://mollom.com" class="mollom-captcha">' . $output . '</a>';
+        $output .= ' (<a href="#" class="mollom-audio-captcha">' . t('play audio CAPTCHA') . '</a>)';
+      }
+      break;
   }
 
   print $output;
@@ -53,7 +89,19 @@ function mollom_report_form(&$form_state
     '#type' => 'value',
     '#value' => $id,
   );
-  $form['feedback'] = _mollom_feedback_options();
+  $form['feedback'] = array(
+    '#type' => 'radios',
+    '#title' => t('Optionally report this to Mollom'),
+    '#options' => array(
+      'none' => t("Don't send feedback to Mollom"),
+      'spam' => t('Report as spam or unsolicited advertising'),
+      'profanity' => t('Report as obscene, violent or profane content'),
+      'low-quality' => t('Report as low-quality content or writing'),
+      'unwanted' => t('Report as unwanted, taunting or off-topic content'),
+    ),
+    '#default_value' => 'none',
+    '#description' => t("Mollom is a web service that helps you moderate your site's content: see <a href=\"http://mollom.com\">http://mollom.com</a> for more information. By sending feedback to Mollom, you teach Mollom about the content you like and dislike, allowing Mollom to do a better job helping you moderate your site's content. If you want to report multiple posts at once, you can use Mollom's bulk operations on the content and comment administration pages."),
+  );
 
   return confirm_form($form,
     t('Are you sure you want to delete and report the content as inappropriate?'),
@@ -105,21 +153,3 @@ function mollom_report_form_submit($form
   }
 }
 
-/**
- * Return a list of the possible feedback options for content.
- */
-function _mollom_feedback_options() {
-  return array(
-    '#type' => 'radios',
-    '#title' => t('Optionally report this to Mollom'),
-    '#options' => array(
-      'none' => t("Don't send feedback to Mollom"),
-      'spam' => t('Report as spam or unsolicited advertising'),
-      'profanity' => t('Report as obscene, violent or profane content'),
-      'low-quality' => t('Report as low-quality content or writing'),
-      'unwanted' => t('Report as unwanted, taunting or off-topic content'),
-    ),
-    '#default_value' => 'none',
-    '#description' => t("Mollom is a web service that helps you moderate your site's content: see <a href=\"http://mollom.com\">http://mollom.com</a> for more information. By sending feedback to Mollom, you teach Mollom about the content you like and dislike, allowing Mollom to do a better job helping you moderate your site's content. If you want to report multiple posts at once, you can use Mollom's bulk operations on the content and comment administration pages."),
-  );
-}