PyukiWiki CVS Commit
pyuki****@lists*****
2012年 2月 14日 (火) 10:57:03 JST
Index: PyukiWiki-Devel-UTF8/plugin/playvideo.inc.pl diff -u PyukiWiki-Devel-UTF8/plugin/playvideo.inc.pl:1.48 PyukiWiki-Devel-UTF8/plugin/playvideo.inc.pl:1.49 --- PyukiWiki-Devel-UTF8/plugin/playvideo.inc.pl:1.48 Tue Feb 14 05:44:14 2012 +++ PyukiWiki-Devel-UTF8/plugin/playvideo.inc.pl Tue Feb 14 10:57:03 2012 @@ -1,6 +1,6 @@ ###################################################################### # playvideo.inc.pl - This is PyukiWiki, yet another Wiki clone. -# $Id: playvideo.inc.pl,v 1.48 2012/02/13 20:44:14 papu Exp $ +# $Id: playvideo.inc.pl,v 1.49 2012/02/14 01:57:03 papu Exp $ # # "playvideo" version 2.2 $$ # Author: Nanami http://nanakochi.daiba.cx/ @@ -73,7 +73,6 @@ use Image::ExifTool; require "plugin/counter.inc.pl"; - if(!defined($::playvideo_plugin_nohtmlvideo_mp4)); $::playvideo_plugin_usedownload=1 # 使ã‚ãªã„時ã¯0ã«ã™ã‚‹ã€‚ if(!defined($::playvideo_plugin_usedownload)); $::playvideo_plugin_plain_download=0 # 生ã®wmvをダウンãƒãƒ¼ãƒ‰ã§ãるよã†ã«ã™ã‚‹ @@ -254,27 +253,36 @@ $height=($height * $params{size} / 100); } - if($fext eq "wmv") { + if($fext=~/auto|inline/) { + if($ENV{HTTP_USER_AGENT}=~/MSIE/) { + $fext=$wmv; + } elsif($ENV{HTTP_USER_AGENT}=~/FireFox|Chrome|Safari|Opera|iPad|iPhone|Andoroid|Konqueror|Lunascape|Sleipnir/) { + $fext=$vhtml; + } else { + $body.=qq(<span class="error">$::resource{playvideo_err_notsupport}</span>); + } + } + if($fext eq $wmv) { if(-r "$videopath/$fname.$fext" ) { - if($ENV{HTTP_USER_AGENT}=~/MS IE/) { - $body.=qq(<span class="error">$::resource{playvideo_err_noie}</span>); - } else { - $playercount++; - $body.=<<EOM; +# if($ENV{HTTP_USER_AGENT}=~/MSIE/) { +# $body.=qq(<span class="error">$::resource{playvideo_err_noie}</span>); +# } else { + $playercount++; + $body.=<<EOM; <object id="Player$layercount" width="$width" height="$height" classid="CLSID:6BF52A52-394A-11d3-B153-00C04F79FAA6"> <param name="autoStart" value="false" /> <param name="URL" value="$playsite/$fname.$ext" /> <embed src="$playsite/$fname.$ext" autostart="0" width="$width" height="$height"></embed> </object> EOM - if($ENV{HTTP_USER_AGENT}=~/Chrome/) { - $body.="<br />" . $::resource{playvideo_wmv_chrome} . "<br />"; - } + if($ENV{HTTP_USER_AGENT}=~/Chrome/) { + $body.="<br />" . $::resource{playvideo_wmv_chrome} . "<br />"; +# } } } else { return &playvideo_err($fname, $::resource{playvideo_ext_wmv}); } - } elsif($fext eq "html") { + } elsif($fext eq $vhtml) { if($browserflg+0 eq 1) { if($playercount eq 0) { $::htmlmode="html5_plugin";
