MDL-27253 add default swf size and allow #d=100x50 URL resizing in mo…

…d/url
chintanp · Apr 21, 2011 · 7774aca · 7774aca
1 parent 4452ed6
commit 7774aca
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/lib/resourcelib.php b/lib/resourcelib.php
@@ -156,6 +156,11 @@ function resourcelib_guess_url_mimetype($fullurl) {
         $fullurl = $matches[1].$matches[3];
     }
 
+    if (preg_match("|^(.*)#.*|", $fullurl, $matches)) {
+        // ignore all anchors
+        $fullurl = $matches[1];
+    }
+
     if (strpos($fullurl, '.php')){
         // we do not really know what is in general php script
         return 'text/html';
@@ -285,17 +290,25 @@ function resourcelib_embed_flashvideo($fullurl, $title, $clicktoopen) {
  * @return string html
  */
 function resourcelib_embed_flash($fullurl, $title, $clicktoopen) {
+    if (preg_match('/[#\?]d=([\d]{1,4}%?)x([\d]{1,4}%?)/', $fullurl, $matches)) {
+        $width    = $matches[1];
+        $height   = $matches[2];
+    } else {
+        $width    = 400;
+        $height   = 300;
+    }
+
     $code = <<<EOT
 <div class="resourcecontent resourceswf">
-  <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
+  <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="$width" height="$height">
     <param name="movie" value="$fullurl" />
     <param name="autoplay" value="true" />
     <param name="loop" value="true" />
     <param name="controller" value="true" />
     <param name="scale" value="aspect" />
     <param name="base" value="." />
 <!--[if !IE]>-->
-    <object type="application/x-shockwave-flash" data="$fullurl">
+    <object type="application/x-shockwave-flash" data="$fullurl" width="$width" height="$height">
       <param name="controller" value="true" />
       <param name="autoplay" value="true" />
       <param name="loop" value="true" />

diff --git a/mod/url/locallib.php b/mod/url/locallib.php
@@ -311,7 +311,7 @@ function url_get_final_display_type($url) {
                              'audio/mp3', 'audio/x-realaudio-plugin', 'x-realaudio-plugin',   // audio formats,
                             );
 
-    $mimetype = mimeinfo('type', $url->externalurl);
+    $mimetype = resourcelib_guess_url_mimetype($url->externalurl);
 
     if (in_array($mimetype, $download)) {
         return RESOURCELIB_DISPLAY_DOWNLOAD;