Permalink
Browse files

Merge branch 'w07_MDL-26030_20_mediafilter' of git://github.com/skoda…

…k/moodle
  • Loading branch information...
2 parents c87a7e4 + a2ee26b commit 345f4176dc72586a7c07871d562ce16513d63004 @stronk7 stronk7 committed Feb 14, 2011
Showing with 179 additions and 54 deletions.
  1. +55 −54 filter/mediaplugin/filter.php
  2. +124 −0 filter/mediaplugin/simpletest/testfiltermediaplugin.php
View
109 filter/mediaplugin/filter.php
@@ -49,93 +49,93 @@ function filter($text, array $options = array()) {
$newtext = $text; // fullclone is slow and not needed here
if (!empty($CFG->filter_mediaplugin_enable_mp3)) {
- $search = '/<a[^>]*?href="([^<]+\.mp3)"[^>]*>.*?<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.mp3)"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_mp3_callback', $newtext);
}
if (!empty($CFG->filter_mediaplugin_enable_ogg)) {
- $search = '/<a[^>]*?href="([^<]+\.ogg)"[^>]*>.*?<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.ogg)"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_ogg_callback', $newtext);
}
if (!empty($CFG->filter_mediaplugin_enable_ogv)) {
- $search = '/<a[^>]*?href="([^<]+\.ogv)"[^>]*>.*?<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.ogv)"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_ogv_callback', $newtext);
}
if (!empty($CFG->filter_mediaplugin_enable_swf)) {
- $search = '/<a[^>]*?href="([^<]+\.swf)(\?d=([\d]{1,3}%?)x([\d]{1,3}%?))?"[^>]*>.*?<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.swf)(\?d=([\d]{1,3}%?)x([\d]{1,3}%?))?"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_swf_callback', $newtext);
}
if (!empty($CFG->filter_mediaplugin_enable_flv)) {
- $search = '/<a[^>]*?href="([^<]+\.flv)(\?d=([\d]{1,3}%?)x([\d]{1,3}%?))?"[^>]*>.*?<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.flv)(\?d=([\d]{1,3}%?)x([\d]{1,3}%?))?"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_flv_callback', $newtext);
}
if (!empty($CFG->filter_mediaplugin_enable_mov)) {
- $search = '/<a[^>]*?href="([^<]+\.mov)(\?d=([\d]{1,3}%?)x([\d]{1,3}%?))?"[^>]*>.*?<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.mov)(\?d=([\d]{1,3}%?)x([\d]{1,3}%?))?"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_qt_callback', $newtext);
- $search = '/<a[^>]*?href="([^<]+\.mp4)(\?d=([\d]{1,4}%?)x([\d]{1,4}%?))?"[^>]*>.*?<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.mp4)(\?d=([\d]{1,4}%?)x([\d]{1,4}%?))?"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_qt_callback', $newtext);
- $search = '/<a[^>]*?href="([^<]+\.m4v)(\?d=([\d]{1,4}%?)x([\d]{1,4}%?))?"[^>]*>.*?<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.m4v)(\?d=([\d]{1,4}%?)x([\d]{1,4}%?))?"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_qt_callback', $newtext);
- $search = '/<a[^>]*?href="([^<]+\.m4a)(\?d=([\d]{1,4}%?)x([\d]{1,4}%?))?"[^>]*>.*?<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.m4a)(\?d=([\d]{1,4}%?)x([\d]{1,4}%?))?"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_qt_callback', $newtext);
}
if (!empty($CFG->filter_mediaplugin_enable_wmv)) {
- $search = '/<a[^>]*?href="([^<]+\.wmv)(\?d=([\d]{1,3}%?)x([\d]{1,3}%?))?"[^>]*>.*?<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.wmv)(\?d=([\d]{1,3}%?)x([\d]{1,3}%?))?"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_wmp_callback', $newtext);
}
if (!empty($CFG->filter_mediaplugin_enable_mpg)) {
- $search = '/<a[^>]*?href="([^<]+\.mpe?g)(\?d=([\d]{1,3}%?)x([\d]{1,3}%?))?"[^>]*>.*?<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.mpe?g)(\?d=([\d]{1,3}%?)x([\d]{1,3}%?))?"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_qt_callback', $newtext);
}
if (!empty($CFG->filter_mediaplugin_enable_avi)) {
- $search = '/<a[^>]*?href="([^<]+\.avi)(\?d=([\d]{1,3}%?)x([\d]{1,3}%?))?"[^>]*>.*?<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.avi)(\?d=([\d]{1,3}%?)x([\d]{1,3}%?))?"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_wmp_callback', $newtext);
}
if (!empty($CFG->filter_mediaplugin_enable_ram)) {
- $search = '/<a[^>]*?href="([^<]+\.ram)"[^>]*>.*?<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.ram)"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_real_callback', $newtext);
}
if (!empty($CFG->filter_mediaplugin_enable_rpm)) {
- $search = '/<a[^>]*?href="([^<]+\.rpm)"[^>]*>.*?<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.rpm)"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_real_callback', $newtext);
}
if (!empty($CFG->filter_mediaplugin_enable_rm)) {
- $search = '/<a[^>]*?href="([^<]+\.rm)"[^>]*>.*?<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.rm)"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_real_callback', $newtext);
}
if (!empty($CFG->filter_mediaplugin_enable_youtube)) {
- //see MDL-23903 for description of recent changes to this regex
- //$search = '/<a.*?href="([^<]*)youtube.com\/watch\?v=([^"]*)"[^>]*>(.*?)<\/a>/is';
- $search = '/<a[^>]*href="([^<]*?)youtube.com\/watch\?v=([^"]*)"[^>]*>(.*?)<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="(([^"]+youtube\.com)\/watch\?v=([A-Za-z0-9\-_]+))[^>]*>(.*?)<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_youtube_callback', $newtext);
- $search = '/<a[^>]*href="([^<]*)youtube.com\/v\/([^"]*)"[^>]*>(.*?)<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="(([^"]+youtube\.com)\/v\/([A-Za-z0-9\-_]*))[^>]+>(.*?)<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_youtube_callback', $newtext);
- $search = '/<a(\s+[^>]+?)?\s+href="((([^"]+)youtube\.com)\/view_play_list\?p=([^"]*))"[^>]*>(.*?)<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="((([^"]+)youtube\.com)\/view_play_list\?p=([A-Za-z0-9\-_]+))[^>]*>(.*?)<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_youtube_playlist_callback', $newtext);
}
if (!empty($CFG->filter_mediaplugin_enable_img)) {
- $search = '/<a[^>]*?href="([^<]+\.jpg)"[^>]*>(.*?)<\/a>/is';
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.jpg)"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_img_callback', $newtext);
- $search = '/<a[^>]*?href="([^<]+\.png)"[^>]*>(.*?)<\/a>/is';
+
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.png)"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_img_callback', $newtext);
- $search = '/<a[^>]*?href="([^<]+\.gif)"[^>]*>(.*?)<\/a>/is';
+
+ $search = '/<a(\s+[^>]+?)?\s+href="([^"]+\.gif)"[^>]*>.*?<\/a>/is';
$newtext = preg_replace_callback($search, 'filter_mediaplugin_img_callback', $newtext);
}
@@ -166,7 +166,7 @@ function filter_mediaplugin_mp3_callback($link) {
$count++;
$id = 'filter_mp3_'.time().$count; //we need something unique because it might be stored in text cache
- $url = addslashes_js($link[1]);
+ $url = addslashes_js($link[2]);
$playerpath = $CFG->wwwroot.'/filter/mediaplugin/mp3player.swf';
$audioplayerpath = $CFG->wwwroot .'/filter/mediaplugin/flowplayer.audio.swf';
@@ -215,7 +215,7 @@ function filter_mediaplugin_ogg_callback($link) {
$count++;
$id = 'filter_ogg_'.time().$count; //we need something unique because it might be stored in text cache
- $url = addslashes_js($link[1]);
+ $url = $link[2];
$printlink = html_writer::link($url, get_string('oggaudio', 'filter_mediaplugin'));
$unsupportedplugins = get_string('unsupportedplugins', 'filter_mediaplugin', $printlink);
$output = <<<OET
@@ -234,7 +234,7 @@ function filter_mediaplugin_ogv_callback($link) {
$count++;
$id = 'filter_ogv_'.time().$count; //we need something unique because it might be stored in text cache
- $url = addslashes_js($link[1]);
+ $url = $link[2];
$printlink = html_writer::link($url, get_string('ogvvideo', 'filter_mediaplugin'));
$unsupportedplugins = get_string('unsupportedplugins', 'filter_mediaplugin', $printlink);
$output = <<<OET
@@ -252,9 +252,9 @@ function filter_mediaplugin_swf_callback($link) {
$count++;
$id = 'filter_swf_'.time().$count; //we need something unique because it might be stored in text cache
- $width = empty($link[3]) ? '400' : $link[3];
- $height = empty($link[4]) ? '300' : $link[4];
- $url = addslashes_js($link[1]);
+ $width = empty($link[4]) ? '400' : $link[4];
+ $height = empty($link[5]) ? '300' : $link[5];
+ $url = $link[2];
$args = Array();
$args['movie'] = $url;
@@ -279,16 +279,17 @@ function filter_mediaplugin_flv_callback($link) {
$count++;
$id = 'filter_flv_'.time().$count; //we need something unique because it might be stored in text cache
- $width = empty($link[3]) ? '480' : $link[3];
- $height = empty($link[4]) ? '360' : $link[4];
- $url = addslashes_js($link[1]);
+ // note: in 1.9.x this used to be 480x360
+ $width = empty($link[4]) ? '800' : $link[4];
+ $height = empty($link[5]) ? '600' : $link[5];
+ $url = addslashes_js($link[2]);
$playerpath = $CFG->wwwroot.'/filter/mediaplugin/flvplayer.swf';
$output = <<<EOT
<span class="mediaplugin mediaplugin_flv" id="$id"></span>
<noscript><div>
- <object width="800" height="600" id="undefined" name="undefined" data="$playerpath" type="application/x-shockwave-flash">
+ <object width="$width" height="$height" id="undefined" name="undefined" data="$playerpath" type="application/x-shockwave-flash">
<param name="movie" value="$playerpath" />
<param name="allowfullscreen" value="true" />
<param name="allowscriptaccess" value="always" />
@@ -305,7 +306,8 @@ function filter_mediaplugin_flv_callback($link) {
}
function filter_mediaplugin_real_callback($link, $autostart=false) {
- $url = addslashes_js($link[1]);
+ $url = $link[2];
+ $jsurl = addslashes_js($link[2]);
$mimetype = mimeinfo('type', $url);
$autostart = $autostart ? 'true' : 'false';
@@ -315,19 +317,19 @@ function filter_mediaplugin_real_callback($link, $autostart=false) {
<script type="text/javascript">
//<![CDATA[
document.write(\'<object classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="240" height="180">\\
- <param name="src" value="'.$url.'" />\\
+ <param name="src" value="'.$jsurl.'" />\\
<param name="autostart" value="'.$autostart.'" />\\
<param name="controls" value="imagewindow" />\\
<param name="console" value="video" />\\
<param name="loop" value="true" />\\
- <embed src="'.$url.'" width="240" height="180" loop="true" type="'.$mimetype.'" controls="imagewindow" console="video" autostart="'.$autostart.'" />\\
+ <embed src="'.$jsurl.'" width="240" height="180" loop="true" type="'.$mimetype.'" controls="imagewindow" console="video" autostart="'.$autostart.'" />\\
</object><br />\\
<object classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="240" height="30">\\
- <param name="src" value="'.$url.'" />\\
+ <param name="src" value="'.$jsurl.'" />\\
<param name="autostart" value="'.$autostart.'" />\\
<param name="controls" value="ControlPanel" />\\
<param name="console" value="video" />\\
- <embed src="'.$url.'" width="240" height="30" controls="ControlPanel" type="'.$mimetype.'" console="video" autostart="'.$autostart.'" />\\
+ <embed src="'.$jsurl.'" width="240" height="30" controls="ControlPanel" type="'.$mimetype.'" console="video" autostart="'.$autostart.'" />\\
</object>\');
//]]>
</script></span>';
@@ -337,15 +339,15 @@ function filter_mediaplugin_real_callback($link, $autostart=false) {
* Change links to Youtube into embedded Youtube videos
*/
function filter_mediaplugin_youtube_callback($link, $autostart=false) {
+ $site = s($link[3]);
+ $param = $link[4]; // video id
+ $info = s(strip_tags($link[5]));
- $site = addslashes_js($link[1]);
- $url = addslashes_js($link[2]);
- $info = addslashes_js(strip_tags($link[3]));//strip out html tags as they won't work in the title attribute
return '<object title="'.$info.'"
class="mediaplugin mediaplugin_youtube" type="application/x-shockwave-flash"
- data="'.$site.'youtube.com/v/'.$url.'&amp;fs=1&amp;rel=0" width="425" height="344">'.
- '<param name="movie" value="'.$site.'youtube.com/v/'.$url.'&amp;fs=1&amp;rel=0" />'.
+ data="'.$site.'/v/'.$param.'&amp;fs=1&amp;rel=0" width="400" height="320">'.
+ '<param name="movie" value="'.$site.'/v/'.$param.'&amp;fs=1&amp;rel=0" />'.
'<param name="FlashVars" value="playerMode=embedded" />'.
'<param name="wmode" value="transparent" />'.
'<param name="allowFullScreen" value="true" />'.
@@ -358,8 +360,8 @@ class="mediaplugin mediaplugin_youtube" type="application/x-shockwave-flash"
function filter_mediaplugin_youtube_playlist_callback($link, $autostart=false) {
$site = s($link[4]);
- $param = s($link[5]);
- $info = s($link[6]);
+ $param = $link[5]; // playlist id
+ $info = s(strip_tags($link[6]));
return '<object title="'.$info.'"
class="mediaplugin mediaplugin_youtube" type="application/x-shockwave-flash"
@@ -375,23 +377,22 @@ class="mediaplugin mediaplugin_youtube" type="application/x-shockwave-flash"
* Change links to images into embedded images
*/
function filter_mediaplugin_img_callback($link, $autostart=false) {
- $url = addslashes_js($link[1]);
- $info = addslashes_js($link[2]);
-
+ $url = $link[2];
+ $info = s(strip_tags($link[2]));
return '<img class="mediaplugin mediaplugin_img" alt="" title="'.$info.'" src="'.$url.'" />';
}
/**
* Embed video using window media player if available
*/
function filter_mediaplugin_wmp_callback($link, $autostart=false) {
- $url = $link[1];
- if (empty($link[3]) or empty($link[4])) {
+ $url = $link[2];
+ if (empty($link[4]) or empty($link[5])) {
$mpsize = '';
$size = 'width="300" height="260"';
$autosize = 'true';
} else {
- $size = 'width="'.$link[3].'" height="'.$link[4].'"';
+ $size = 'width="'.$link[4].'" height="'.$link[5].'"';
$mpsize = $size;
$autosize = 'false';
}
@@ -428,11 +429,11 @@ function filter_mediaplugin_wmp_callback($link, $autostart=false) {
}
function filter_mediaplugin_qt_callback($link, $autostart=false) {
- $url = $link[1];
- if (empty($link[3]) or empty($link[4])) {
+ $url = $link[2];
+ if (empty($link[4]) or empty($link[5])) {
$size = 'width="440" height="315"';
} else {
- $size = 'width="'.$link[3].'" height="'.$link[4].'"';
+ $size = 'width="'.$link[4].'" height="'.$link[5].'"';
}
$mimetype = mimeinfo('type', $url);
$autostart = $autostart ? 'true' : 'false';
View
124 filter/mediaplugin/simpletest/testfiltermediaplugin.php
@@ -0,0 +1,124 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Unit test for the filter_mediaplugin
+ *
+ * @package filter
+ * @subpackage Mediaplugin
+ * @copyright 2011 Rossiani Wijaya <rwijaya@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->dirroot . '/filter/mediaplugin/filter.php'); // Include the code to test
+
+/**
+ * Test cases for filter_mediaplugin class
+ */
+class filter_mediaplugin_test extends UnitTestCase {
+
+ function test_filter_mediaplugin_link() {
+ global $CFG;
+
+ // we need to enable the plugins somehow
+ $oldcfg = clone($CFG); // very, very ugly hack
+ $CFG->filter_mediaplugin_enable_mp3 = 1;
+ $CFG->filter_mediaplugin_enable_ogg = 1;
+ $CFG->filter_mediaplugin_enable_ogv = 1;
+ $CFG->filter_mediaplugin_enable_swf = 1;
+ $CFG->filter_mediaplugin_enable_flv = 1;
+ $CFG->filter_mediaplugin_enable_mov = 1;
+ $CFG->filter_mediaplugin_enable_wmv = 1;
+ $CFG->filter_mediaplugin_enable_mpg = 1;
+ $CFG->filter_mediaplugin_enable_avi = 1;
+ $CFG->filter_mediaplugin_enable_ram = 1;
+ $CFG->filter_mediaplugin_enable_rpm = 1;
+ $CFG->filter_mediaplugin_enable_rm = 1;
+ $CFG->filter_mediaplugin_enable_youtube = 1;
+ $CFG->filter_mediaplugin_enable_img = 1;
+
+
+ $filterplugin = new filter_mediaplugin(null, array());
+
+ $validtexts = array (
+ '<a href="http://moodle.org/testfile/test.mp3">test mp3</a>',
+ '<a href="http://moodle.org/testfile/test.ogg">test ogg</a>',
+ '<a id="movie player" class="center" href="http://moodle.org/testfile/test.mpg">test mpg</a>',
+ '<a href="http://moodle.org/testfile/test.ram">test</a>',
+ '<a href="http://www.youtube.com/watch?v=JghQgA2HMX8" class="href=css">test file</a>',
+ '<a class="youtube" href="http://www.youtube.com/watch?v=JghQgA2HMX8">test file</a>',
+ '<a class="_blanktarget" href="http://moodle.org/testfile/test.flv?d=100x100">test flv</a>',
+ '<a class="hrefcss" href="http://www.youtube.com/watch?v=JghQgA2HMX8">test file</a>',
+ '<a href="http://www.moodle.org/logo.jpg"><img src="http://moodle.org/test.jpg" /></a>',
+ '<a href="http://www.moodle.org/logo.rpm">rpm file</a>',
+ '<a class="content" href="http://moodle.org/testfile/test.avi">test mp3</a>',
+ '<a id="audio" href="http://moodle.org/testfile/test.mp3">test mp3</a>',
+ '<a href="http://moodle.org/testfile/test.mp3">test mp3</a>',
+ '<a href="http://moodle.org/testfile/test.mp3">test mp3</a>',
+ '<a href="http://www.youtube.com/watch?v=JghQgA2HMX8?d=200x200">youtube\'s</a>',
+ '<a
+ href="http://moodle.org/testfile/test.mp3">
+ test mp3</a>',
+ '<a class="content"
+
+
+ href="http://moodle.org/testfile/test.avi">test mp3
+ </a>',
+ '<a href="http://www.youtube.com/watch?v=JghQgA2HMX8?d=200x200" >youtube\'s</a>'
+ );
+
+ //test for valid link
+ foreach ($validtexts as $text) {
+ $msg = "Testing text: ". $text;
+ $filter = $filterplugin->filter($text);
+ $this->assertNotEqual($text, $filter, $msg);
+ }
+
+ $invalidtexts = array(
+ '<a class="_blanktarget">href="http://moodle.org/testfile/test.mp3"</a>',
+ '<a>test test</a>',
+ '<a >test test</a>',
+ '<a >test test</a>',
+ '<a >test test</a>',
+ '<ahref="http://moodle.org/testfile/test.mp3">sample</a>',
+ '<a href="" test></a>',
+ '<a class="_blanktarget" href="http://moodle.org/testfile/test.flv?d=100x">test flv</a>',
+ '<a href="http://www.moodle.com/path/to?#param=29">test</a>',
+ '<a href="http://moodle.org/testfile/test.mp3">test mp3',
+ '<a href="http://moodle.org/testfile/test.mp3"test</a>',
+ '<a href="http://moodle.org/testfile/">test</a>',
+ '<a href="http://www.moodle.org/path/to/test.flv#param2=1?d=100x100">test</a>',
+ '<href="http://moodle.org/testfile/test.avi">test</a>',
+ '<a ahref="http://moodle.org/testfile/test.mp3">test mp3</a>',
+ '<abbr href="http://moodle.org/testfile/test.mp3">test mp3</abbr>',
+ '<ahref="http://moodle.org/testfile/test.mp3">test mp3</a>',
+ '<a class="content"href="http://moodle.org/testfile/test.mp3">test mp3</a>',
+ '<aclass="content" href="http://moodle.org/testfile/test.mp3">test mp3</a>'
+ );
+
+ //test for invalid link
+ foreach ($invalidtexts as $text) {
+ $msg = "Testing text: ". $text;
+ $filter = $filterplugin->filter($text);
+ $this->assertEqual($text, $filter, $msg);
+ }
+
+ $CFG = $oldcfg; // very, very ugly hack
+ }
+}

0 comments on commit 345f417

Please sign in to comment.