summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2009-01-16 19:25:23 +0100
committerAndreas Gohr <andi@splitbrain.org>2009-01-16 19:25:23 +0100
commitd4c61e61a8c538dba420faa1f5725b10c5d7c398 (patch)
tree1027a33d8f99958f7eb2f48be7a5049b6d7c790c
parent07bf32b240a999581627aadcc58c044a577dc62a (diff)
downloadrpg-d4c61e61a8c538dba420faa1f5725b10c5d7c398.tar.gz
rpg-d4c61e61a8c538dba420faa1f5725b10c5d7c398.tar.bz2
Use html_flashobject for MultiUploader
darcs-hash:20090116182523-7ad00-3bf44603ff1f5193877e0a29400b25a8edc5365a.gz
-rw-r--r--inc/html.php4
-rw-r--r--inc/media.php15
2 files changed, 3 insertions, 16 deletions
diff --git a/inc/html.php b/inc/html.php
index 43ab397d0..c697b1f51 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1465,7 +1465,7 @@ function html_flashobject($swf,$width,$height,$params=null,$flashvars=null,$atts
// prepare the object attributes
if(is_null($atts)) $atts = array();
$atts['width'] = (int) $width;
- $atts['height'] = (int) $heigh;
+ $atts['height'] = (int) $height;
if(!$atts['width']) $atts['width'] = 425;
if(!$atts['height']) $atts['height'] = 350;
@@ -1494,7 +1494,7 @@ function html_flashobject($swf,$width,$height,$params=null,$flashvars=null,$atts
// add flashvars
if(is_array($flashvars)){
- $out .= ' <param name="flashvars" value="'.hsc(buildURLparams($flashvars)).'" />'.NL;
+ $out .= ' <param name="FlashVars" value="'.buildURLparams($flashvars).'" />'.NL;
}
// alternative content
diff --git a/inc/media.php b/inc/media.php
index de9273546..b9e7c6c08 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -630,20 +630,7 @@ function media_uploadform($ns, $auth){
?>
<div id="dw__flashupload" style="display:none">
<div class="upload"><?php echo $lang['mu_intro']?></div>
- <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="100%" height="100%"
- codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab">
- <param name="movie" value="multipleUpload.swf?t=<?php echo time()?>" />
- <param name="quality" value="high" />
- <param name="bgcolor" value="#ffffff" />
- <param name="FlashVars" value="<?php echo $var?>" />
- <embed src="multipleUpload.swf?t=<?php echo time()?>" quality="high" bgcolor="#ffffff"
- width="100%" height="100%" name="fileUpload" align="middle"
- play="true" loop="false" quality="high" FlashVars="<?php echo $var?>"
- allowScriptAccess="sameDomain"
- type="application/x-shockwave-flash"
- pluginspage="http://www.macromedia.com/go/getflashplayer">
- </embed>
- </object>
+ <?php echo html_flashobject('multipleUpload.swf','500','190',null,$opt); ?>
</div>
<?php
}