Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[7676] trunk
|
From: <var...@us...> - 2010-09-08 10:08:22
|
Revision: 7676
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7676&view=rev
Author: vargenau
Date: 2010-09-08 10:08:16 +0000 (Wed, 08 Sep 2010)
Log Message:
-----------
plugin Video code reverted to r7204 to make it work again; upgrade Flowplayer to 3.2.4
Modified Paths:
--------------
trunk/TODO
trunk/lib/plugin/Video.php
Added Paths:
-----------
trunk/themes/default/flowplayer-3.2.4.swf
trunk/themes/default/flowplayer.controls-3.2.2.swf
Removed Paths:
-------------
trunk/themes/default/flowplayer-3.1.4.swf
trunk/themes/default/flowplayer.controls-3.1.4.swf
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2010-09-03 13:08:03 UTC (rev 7675)
+++ trunk/TODO 2010-09-08 10:08:16 UTC (rev 7676)
@@ -9,8 +9,10 @@
** no "make clean" in themes
** "make clean" does not work in themes with no Javascript
** in MonoBook, IEFixes.js cannot be minimized, yuicompressor-2.4.2 gives syntax errors
-* plugin Video does not work
+* plugin Video does not work (code reverted to r7204 to make it work again)
+----
+
short-term TODO:
* rename should check existing subpages and rename these also.
* Sidebar: merge AVL theme (internal MonoBook derivate with customizable
Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php 2010-09-03 13:08:03 UTC (rev 7675)
+++ trunk/lib/plugin/Video.php 2010-09-08 10:08:16 UTC (rev 7676)
@@ -2,7 +2,6 @@
// rcs_id('$Id$');
/*
* Copyright 2009 Roger Guignard and Marc-Etienne Vargenau, Alcatel-Lucent
- * Copyright 2009 Reini Urban
*
* This file is part of PhpWiki.
*
@@ -55,12 +54,11 @@
}
function getDefaultArguments() {
- return array('width' => 460,
- 'height' => 320,
- 'url' => '',
- 'file' => '',
- 'autoplay' => 'false',
- 'image' => ''
+ return array('width' => 460,
+ 'height' => 320,
+ 'url' => '',
+ 'file' => '',
+ 'autoplay' => 'false'
);
}
@@ -75,33 +73,72 @@
} elseif ($url && $file) {
return $this->error(_("Choose only one of 'url' or 'file' parameters."));
} elseif ($file) {
- $url = getUploadDataPath() . $file;
+ // $url = SERVER_URL . getUploadDataPath() . '/' . $file;
+ $url = getUploadDataPath() . '/' . $file;
}
- // TODO: Check HTML5 browser capabilities
if (string_ends_with($url, ".ogg")) {
return HTML::video(array('autoplay' => 'true', 'controls' => 'true', 'src' => $url),
_("Your browser does not understand the HTML 5 video tag."));
}
- if (!$image) $image = $url;
- if ($autoplay != 'true' and $autoplay != 'false')
- return $this->error(fmt("Invalid argument %s", "autoplay"));
- if (!is_numeric($width))
- return $this->error(fmt("Invalid argument %s", "width"));
- if (!is_numeric($height))
- return $this->error(fmt("Invalid argument %s", "height"));
- if (preg_match("/'/", $url))
- return $this->error(fmt("Invalid argument %s", "url"));
- $params = array("data" => SERVER_URL . $WikiTheme->_findData('flowplayer-3.1.4.swf'),
- "type" => "application/x-shockwave-flash",
- "width" => $width,
- "height" => $height,
- "allowfullscreen" => "true",
- "allowscriptaccess" => "false",
- "flashvars"=>
- "config={'clip':{'url':'" . $url . "','autoPlay':" . $autoplay . "}}'");
- return ImgObject(HTML::img(array('src' => $image)), $params);
+ $html = HTML();
+
+ if (isBrowserIE()) {
+ $object = HTML::object(array('id' => 'flowplayer',
+ 'classid' => 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000',
+ 'width' => $width,
+ 'height' => $height));
+
+ $param = HTML::param(array('name' => 'movie',
+ 'value' => SERVER_URL . $WikiTheme->_findData('flowplayer-3.2.4.swf')));
+ $object->pushContent($param);
+
+ $param = HTML::param(array('name' => "allowfullscreen",
+ 'value' => "true"));
+ $object->pushContent($param);
+
+ $param = HTML::param(array('name' => "allowscriptaccess",
+ 'value' => "false"));
+ $object->pushContent($param);
+
+ $flashvars = "config={'clip':{'url':'" . $url . "','autoPlay':" . $autoplay . "}}";
+
+ $param = HTML::param(array('name' => 'flashvars',
+ 'value' => $flashvars));
+ $object->pushContent($param);
+
+ $embed = HTML::embed(array('type' => 'application/x-shockwave-flash',
+ 'width' => $width,
+ 'height' => $height,
+ 'src' => SERVER_URL . $WikiTheme->_findData('flowplayer-3.2.4.swf'),
+ 'flashvars' => $flashvars));
+ $object->pushContent($embed);
+
+ $html->pushContent($object);
+
+ } else {
+ $object = HTML::object(array('data' => SERVER_URL . $WikiTheme->_findData('flowplayer-3.2.4.swf'),
+ 'type' => "application/x-shockwave-flash",
+ 'width' => $width,
+ 'height' => $height));
+
+ $param = HTML::param(array('name' => "allowfullscreen",
+ 'value' => "true"));
+ $object->pushContent($param);
+
+ $param = HTML::param(array('name' => "allowscriptaccess",
+ 'value' => "false"));
+ $object->pushContent($param);
+
+ $value = "config={'clip':{'url':'" . $url . "','autoPlay':" . $autoplay . "}}";
+ $param = HTML::param(array('name' => "flashvars",
+ 'value' => $value));
+ $object->pushContent($param);
+
+ $html->pushContent($object);
+ }
+ return $html;
}
};
Deleted: trunk/themes/default/flowplayer-3.1.4.swf
===================================================================
(Binary files differ)
Copied: trunk/themes/default/flowplayer-3.2.4.swf (from rev 7675, trunk/themes/default/flowplayer-3.1.4.swf)
===================================================================
(Binary files differ)
Deleted: trunk/themes/default/flowplayer.controls-3.1.4.swf
===================================================================
(Binary files differ)
Copied: trunk/themes/default/flowplayer.controls-3.2.2.swf (from rev 7675, trunk/themes/default/flowplayer.controls-3.1.4.swf)
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
