From d07851e131d7793cbbe08ebd016b64a3a854bf23 Mon Sep 17 00:00:00 2001 From: moodler Date: Tue, 25 Oct 2005 07:40:09 +0000 Subject: [PATCH] Added support for FLV. Might need to replace the FLV player if we don't get explicit permission for this one. Thanks to Julian Ridden for the code! --- filter/mediaplugin/defaultsettings.php | 8 ++++++++ filter/mediaplugin/filter.php | 21 +++++++++++++++++++++ filter/mediaplugin/filterconfig.html | 6 ++++++ filter/mediaplugin/flvplayer.README.txt | 7 +++++++ filter/mediaplugin/flvplayer.swf | Bin 0 -> 2913 bytes 5 files changed, 42 insertions(+) create mode 100644 filter/mediaplugin/flvplayer.README.txt create mode 100644 filter/mediaplugin/flvplayer.swf diff --git a/filter/mediaplugin/defaultsettings.php b/filter/mediaplugin/defaultsettings.php index e0ec1defeeb..1f3427d342c 100644 --- a/filter/mediaplugin/defaultsettings.php +++ b/filter/mediaplugin/defaultsettings.php @@ -49,4 +49,12 @@ set_config( 'filter_mediaplugin_enable_avi', 1 ); } } + if (!isset($CFG->filter_mediaplugin_enable_flv)) { + if (isset($CFG->filter_mediaplugin_ignore_flv)) { + set_config( 'filter_mediaplugin_enable_flv', !$CFG->filter_mediaplugin_ignore_flv ); + } + else { + set_config( 'filter_mediaplugin_enable_flv', 1 ); + } + } ?> diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php index 637d23a32fa..0d57f829c13 100644 --- a/filter/mediaplugin/filter.php +++ b/filter/mediaplugin/filter.php @@ -69,6 +69,27 @@ function mediaplugin_filter($courseid, $text) { $text = preg_replace($search, $replace, $text); } + + if ($CFG->filter_mediaplugin_enable_flv) { + $search = '/]*)>(.*?)<\/a>/is'; + + $replace = '\\0 wwwroot/filter/mediaplugin/flvplayer.swf?file=\\2.flv\" />"; + $replace .= ' '; + $replace .= ' '; + $replace .= ' '; + $replace .= " wwwroot/filter/mediaplugin/flvplayer.swf?file=\\2.flv\" "; + $replace .= " quality=\"high\" bgcolor=\"#FFFFFF\" width=\"480\" height=\"360\" name=\"flvplayer\" "; + $replace .= ' type="application/x-shockwave-flash" '; + $replace .= ' flashvars="'.$c.'" '; + $replace .= ' pluginspage="http://www.macromedia.com/go/getflashplayer">'; + $replace .= ''; + $replace .= ' '; + + $text = preg_replace($search, $replace, $text); + } if ($CFG->filter_mediaplugin_enable_mov) { $search = '/]*)>(.*?)<\/a>/is'; diff --git a/filter/mediaplugin/filterconfig.html b/filter/mediaplugin/filterconfig.html index c57208c63d9..c9f9983d4c6 100644 --- a/filter/mediaplugin/filterconfig.html +++ b/filter/mediaplugin/filterconfig.html @@ -10,6 +10,7 @@ $txt->mediapluginwmv = get_string( 'mediapluginwmv','admin' ); $txt->mediapluginmpg = get_string( 'mediapluginmpg','admin' ); $txt->mediapluginavi = get_string( 'mediapluginavi','admin' ); + $txt->mediapluginflv = get_string( 'mediapluginflv','admin' ); $txt->yes = get_string( 'yes' ); $txt->no = get_string( 'no' ); @@ -47,4 +48,9 @@ filter_mediaplugin_enable_avi ); ?> + + mediapluginflv ?> + filter_mediaplugin_enable_flv ); ?> + diff --git a/filter/mediaplugin/flvplayer.README.txt b/filter/mediaplugin/flvplayer.README.txt new file mode 100644 index 00000000000..85c7365e94d --- /dev/null +++ b/filter/mediaplugin/flvplayer.README.txt @@ -0,0 +1,7 @@ +The FLV player is by Jeroen Wijering - www.jeroenwijering.com +produced under the creative commons license + +(exact terms: http://creativecommons.org/licenses/by-nc-sa/2.5/) + +We are currently waiting for clearance from him to include this +in Moodle under the GPL ... it will be removed if he says no. diff --git a/filter/mediaplugin/flvplayer.swf b/filter/mediaplugin/flvplayer.swf new file mode 100644 index 0000000000000000000000000000000000000000..694e3910ae47a99b448a3b2d14cc68c881168e29 GIT binary patch literal 2913 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 LCaeDfr}wNyV@Rye literal 0 HcmV?d00001