Merged fixes for mp3 and flv files from MDL-9739

This commit is contained in:
moodler
2007-07-19 06:00:19 +00:00
parent cf3ccea5e5
commit ece92348bf
+57 -18
View File
@@ -223,6 +223,10 @@ function display() {
} else if ($mimetype == "audio/mp3") { // It's an MP3 audio file
$resourcetype = "mp3";
$embedded = true;
} else if ($mimetype == "video/x-flv") { // It's a Flash video file
$resourcetype = "flv";
$embedded = true;
} else if (substr($mimetype, 0, 10) == "video/x-ms") { // It's a Media Player file
$resourcetype = "mediaplayer";
@@ -428,31 +432,66 @@ function display() {
}
$c .= '&volText='.get_string('vol', 'resource').'&panText='.get_string('pan','resource');
$c = htmlentities($c);
$id = 'filter_mp3_'.time(); //we need something unique because it might be stored in text cache
$cleanurl = addslashes_js($fullurl);
// If we have Javascript, use UFO to embed the MP3 player, otherwise depend on plugins
echo '<div class="resourcecontent resourcemp3">';
echo '<div class="mp3player">';
echo '<object classid="clsid:D27CDb6E-AE6D-11cf-96b8-444553540000" ';
echo ' codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" ';
echo ' width="600" height="70" id="mp3player">';
echo '<param name="movie" value="'.$CFG->wwwroot.'/lib/mp3player/mp3player.swf?src='.$fullurl.'">';
echo '<param name="quality" value="high">';
echo '<param name="bgcolor" value="#333333">';
echo '<param name="flashvars" value="'.$c.'&amp;" />';
echo '<!--[if !IE]>-->';
echo '<span class="mediaplugin mediaplugin_mp3" id="'.$id.'"></span>'.
'<script type="text/javascript">'."\n".
'//<![CDATA['."\n".
'var FO = { movie:"'.$CFG->wwwroot.'/lib/mp3player/mp3player.swf?src='.$cleanurl.'",'."\n".
'width:"600", height:"70", majorversion:"6", build:"40", flashvars:"'.$c.'", quality: "high" };'."\n".
'UFO.create(FO, "'.$id.'");'."\n".
'//]]>'."\n".
'</script>'."\n";
echo '<noscript>';
echo "<object type=\"audio/mpeg\" data=\"$fullurl\" width=\"600\" height=\"70\">";
echo "<param name=\"src\" value=\"$fullurl\" />";
echo '<param name="quality" value="high" />';
echo '<param name="bgcolor" value="#333333" />';
echo '<param name="flashvars" value="'.$c.'&amp;" />';
echo '<param name="autoplay" value="true" />';
echo '<param name="autoStart" value="0" />';
echo '<!--<![endif]-->';
echo '<a href="' . $fullurl . '">' . $fullurl . '</a>';
echo '<!--[if !IE]>-->';
echo '</object>';
echo '<!--<![endif]-->';
echo '<param name="autostart" value="true" />';
echo '</object>';
echo '<p><a href="' . $fullurl . '">' . $fullurl . '</a></p>';
echo '</noscript>';
echo '</div>';
} else if ($resourcetype == "flv") {
$id = 'filter_flv_'.time(); //we need something unique because it might be stored in text cache
$cleanurl = addslashes_js($fullurl);
// If we have Javascript, use UFO to embed the FLV player, otherwise depend on plugins
echo '<div class="resourcecontent resourceflv">';
echo '<span class="mediaplugin mediaplugin_flv" id="'.$id.'"></span>'.
'<script type="text/javascript">'."\n".
'//<![CDATA['."\n".
'var FO = { movie:"'.$CFG->wwwroot.'/filter/mediaplugin/flvplayer.swf?file='.$cleanurl.'",'."\n".
'width:"600", height:"400", majorversion:"6", build:"40", allowscriptaccess:"never", quality: "high" };'."\n".
'UFO.create(FO, "'.$id.'");'."\n".
'//]]>'."\n".
'</script>'."\n";
echo '<noscript>';
echo "<object type=\"video/x-flv\" data=\"$fullurl\" width=\"600\" height=\"400\">";
echo "<param name=\"src\" value=\"$fullurl\" />";
echo '<param name="quality" value="high" />';
echo '<param name="autoplay" value="true" />';
echo '<param name="autostart" value="true" />';
echo '</object>';
echo '<p><a href="' . $fullurl . '">' . $fullurl . '</a></p>';
echo '</noscript>';
echo '</div>';
echo '</div>';
} else if ($resourcetype == "mediaplayer") {
echo '<div class="resourcecontent resourcewmv">';