]> git.mjollnir.org Git - moodle.git/commitdiff
"MDL-21103, fixed regex filter in tinymce plugin, and overwriten uploaded file with...
authorDongsheng Cai <unoter@gmail.com>
Tue, 15 Dec 2009 09:19:04 +0000 (09:19 +0000)
committerDongsheng Cai <unoter@gmail.com>
Tue, 15 Dec 2009 09:19:04 +0000 (09:19 +0000)
lib/editor/tinymce/plugins/moodlemedia/js/media.js
lib/editor/tinymce/plugins/moodlemedia/moodlemedia.htm
repository/upload/repository.class.php

index 42ff3ae8f78067d1cf93c589edd38bb2f9c0dd09..d0c45839892f662a5a1ecf28d37377d84f4e4c79 100755 (executable)
-/**\r
- * @author Dongsheng Cai <dongsheng@moodle.com>\r
- */\r
-tinyMCEPopup.requireLangPack();\r
-\r
-var oldWidth, oldHeight, ed, url;\r
-\r
-if (url = tinyMCEPopup.getParam("media_external_list_url"))\r
-       document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');\r
-\r
-function init() {\r
-    ed = tinyMCEPopup.editor;\r
-       document.getElementById('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');\r
-}\r
-\r
-function insertMedia() {\r
-       var f = document.forms[0];\r
-    var h = '<a href="'+f.src.value+'">'+f.filename.value+'</a>';\r
-    ed.execCommand('mceInsertContent', false, h);\r
-       tinyMCEPopup.close();\r
-}\r
-\r
-function getType(v) {\r
-       var fo, i, c, el, x, f = document.forms[0];\r
-\r
-       fo = ed.getParam("media_types", "flash=swf;flv=flv;shockwave=dcr;qt=mov,qt,mpg,mp3,mp4,mpeg;shockwave=dcr;wmp=avi,wmv,wm,asf,asx,wmx,wvx;rmp=rm,ra,ram").split(';');\r
-\r
-       // YouTube\r
-       if (v.match(/watch\?v=(.+)(.*)/)) {\r
-               f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1];\r
-               return 'flash';\r
-       } else if (v.match(/v\/(.+)(.*)/)) {\r
-               return 'flash';\r
-    }\r
-\r
-       // Google video\r
-       if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) {\r
-               f.src.value = 'http://video.google.com/googleplayer.swf?docId=' + v.substring('http://video.google.com/videoplay?docid='.length) + '&hl=en';\r
-               return 'flash';\r
-       }\r
-\r
-       for (i=0; i<fo.length; i++) {\r
-               c = fo[i].split('=');\r
-\r
-               el = c[1].split(',');\r
-               for (x=0; x<el.length; x++)\r
-               if (v.indexOf('.' + el[x]) != -1)\r
-                       return c[0];\r
-       }\r
-\r
-       return null;\r
-}\r
-\r
-\r
-function serializeParameters() {\r
-       var d = document, f = d.forms[0], s = '';\r
-       s += getStr(null, 'src');\r
-    s += 'width:300,';\r
-    s += 'height:225,';\r
-\r
-    // delete the tail comma\r
-       s = s.length > 0 ? s.substring(0, s.length - 1) : s;\r
-\r
-       return s;\r
-}\r
-\r
-\r
-function getStr(p, n, d) {\r
-       var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];\r
-       var v = e.type == "hidden" ? e.value : e.options[e.selectedIndex].value;\r
-\r
-       if (n == 'src')\r
-               v = tinyMCEPopup.editor.convertURL(v, 'src', null);\r
-\r
-       return ((n == d || v == '') ? '' : n + ":'" + jsEncode(v) + "',");\r
-}\r
-\r
-function jsEncode(s) {\r
-       s = s.replace(new RegExp('\\\\', 'g'), '\\\\');\r
-       s = s.replace(new RegExp('"', 'g'), '\\"');\r
-       s = s.replace(new RegExp("'", 'g'), "\\'");\r
-\r
-       return s;\r
-}\r
-\r
-function generatePreview(c) {\r
-    var f = document.forms[0], p = document.getElementById('prev'), h = '', cls, pl, n, type, codebase, wp, hp, nw, nh;\r
-\r
-    p.innerHTML = '<!-- x --->';\r
-    var type = getType(f.src.value);\r
-    var re = new RegExp("(.+)\#(.+)", "i");\r
-    var result = f.src.value.match(re);\r
-    f.src.value = result[1];\r
-    f.filename.value = result[2];\r
-\r
-       // After constrain\r
-       pl = serializeParameters();\r
-\r
-    switch (type) {\r
-        case 'flash':\r
-            cls = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';\r
-            codebase = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';\r
-            type = 'application/x-shockwave-flash';\r
-            break;\r
-               case "shockwave":\r
-                       cls = 'clsid:166B1BCA-3F9C-11CF-8075-444553540000';\r
-                       codebase = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';\r
-                       type = 'application/x-director';\r
-                       break;\r
-\r
-               case "qt":\r
-                       cls = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';\r
-                       codebase = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';\r
-                       type = 'video/quicktime';\r
-                       break;\r
-\r
-               case "wmp":\r
-                       cls = ed.getParam('media_wmp6_compatible') ? 'clsid:05589FA1-C356-11CE-BF01-00AA0055595A' : 'clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6';\r
-                       codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';\r
-                       type = 'application/x-mplayer2';\r
-                       break;\r
-\r
-               case "rmp":\r
-                       cls = 'clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA';\r
-                       codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';\r
-                       type = 'audio/x-pn-realaudio-plugin';\r
-                       break;\r
-    }\r
-\r
-       if (pl == '') {\r
-               p.innerHTML = '';\r
-               return;\r
-       }\r
-\r
-       pl = tinyMCEPopup.editor.plugins.moodlemedia._parse(pl);\r
-\r
-       if (!pl.src) {\r
-               p.innerHTML = '';\r
-               return;\r
-       }\r
-\r
-       pl.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(pl.src);\r
-       pl.width = !pl.width ? 100 : pl.width;\r
-       pl.height = !pl.height ? 100 : pl.height;\r
-    pl.id = !pl.id ? 'moodlemediaid' : pl.id;\r
-    pl.name = !pl.name ? 'moodlemedianame' : pl.name;\r
-       pl.align = !pl.align ? '' : pl.align;\r
-\r
-       // Avoid annoying warning about insecure items\r
-       if (!tinymce.isIE || document.location.protocol != 'https:') {\r
-               h += '<object classid="' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';\r
-\r
-               for (n in pl) {\r
-                       h += '<param name="' + n + '" value="' + pl[n] + '">';\r
-\r
-                       // Add extra url parameter if it's an absolute URL\r
-                       if (n == 'src' && pl[n].indexOf('://') != -1)\r
-                               h += '<param name="url" value="' + pl[n] + '" />';\r
-               }\r
-       }\r
-\r
-       h += '<embed type="' + type + '" ';\r
-\r
-       for (n in pl)\r
-               h += n + '="' + pl[n] + '" ';\r
-\r
-       h += '></embed>';\r
-\r
-       // Avoid annoying warning about insecure items\r
-       if (!tinymce.isIE || document.location.protocol != 'https:')\r
-               h += '</object>';\r
-\r
-       p.innerHTML = "<!-- x --->" + h;\r
-}\r
-\r
-tinyMCEPopup.onInit.add(init);\r
+/**
+ * @author Dongsheng Cai <dongsheng@moodle.com>
+ */
+tinyMCEPopup.requireLangPack();
+
+var oldWidth, oldHeight, ed, url;
+
+if (url = tinyMCEPopup.getParam("media_external_list_url"))
+       document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+
+function init() {
+    ed = tinyMCEPopup.editor;
+       document.getElementById('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');
+}
+
+function insertMedia() {
+       var f = document.forms[0];
+    var h = '<a href="'+f.src.value+'">'+f.filename.value+'</a>';
+    ed.execCommand('mceInsertContent', false, h);
+       tinyMCEPopup.close();
+}
+
+function getType(v) {
+       var fo, i, c, el, x, f = document.forms[0];
+
+       fo = ed.getParam("media_types", "flash=swf;flv=flv;shockwave=dcr;qt=mov,qt,mpg,mp3,mp4,mpeg;shockwave=dcr;wmp=avi,wmv,wm,asf,asx,wmx,wvx;rmp=rm,ra,ram").split(';');
+
+       // YouTube
+       if (v.match(/watch\?v=(.+)(.*)/)) {
+               f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1];
+               return 'flash';
+       } else if (v.match(/v\/(.+)(.*)/)) {
+               return 'flash';
+    }
+
+       // Google video
+       if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) {
+               f.src.value = 'http://video.google.com/googleplayer.swf?docId=' + v.substring('http://video.google.com/videoplay?docid='.length) + '&hl=en';
+               return 'flash';
+       }
+
+       for (i=0; i<fo.length; i++) {
+               c = fo[i].split('=');
+
+               el = c[1].split(',');
+               for (x=0; x<el.length; x++)
+               if (v.indexOf('.' + el[x]) != -1)
+                       return c[0];
+       }
+
+       return null;
+}
+
+
+function serializeParameters() {
+       var d = document, f = d.forms[0], s = '';
+       s += getStr(null, 'src');
+    s += 'width:300,';
+    s += 'height:225,';
+
+    // delete the tail comma
+       s = s.length > 0 ? s.substring(0, s.length - 1) : s;
+
+       return s;
+}
+
+
+function getStr(p, n, d) {
+       var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];
+       var v = e.type == "hidden" ? e.value : e.options[e.selectedIndex].value;
+
+       if (n == 'src')
+               v = tinyMCEPopup.editor.convertURL(v, 'src', null);
+
+       return ((n == d || v == '') ? '' : n + ":'" + jsEncode(v) + "',");
+}
+
+function jsEncode(s) {
+       s = s.replace(new RegExp('\\\\', 'g'), '\\\\');
+       s = s.replace(new RegExp('"', 'g'), '\\"');
+       s = s.replace(new RegExp("'", 'g'), "\\'");
+
+       return s;
+}
+
+function generatePreview(c) {
+    var f = document.forms[0], p = document.getElementById('prev'), h = '', cls, pl, n, type, codebase, wp, hp, nw, nh;
+
+    p.innerHTML = '<!-- x --->';
+    var type = getType(f.src.value);
+    var re = new RegExp("(.+)\#(.+)", "i");
+    var result = f.src.value.match(re);
+    if (result) {
+        f.src.value = result[1];
+        f.filename.value = result[2];
+    } else {
+        f.src.value = f.src.value;
+        f.filename.value = f.src.value;
+    }
+
+       // After constrain
+       pl = serializeParameters();
+
+    switch (type) {
+        case 'flash':
+            cls = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
+            codebase = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
+            type = 'application/x-shockwave-flash';
+            break;
+               case "shockwave":
+                       cls = 'clsid:166B1BCA-3F9C-11CF-8075-444553540000';
+                       codebase = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';
+                       type = 'application/x-director';
+                       break;
+
+               case "qt":
+                       cls = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';
+                       codebase = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';
+                       type = 'video/quicktime';
+                       break;
+
+               case "wmp":
+                       cls = ed.getParam('media_wmp6_compatible') ? 'clsid:05589FA1-C356-11CE-BF01-00AA0055595A' : 'clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6';
+                       codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
+                       type = 'application/x-mplayer2';
+                       break;
+
+               case "rmp":
+                       cls = 'clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA';
+                       codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
+                       type = 'audio/x-pn-realaudio-plugin';
+                       break;
+    }
+
+       if (pl == '') {
+               p.innerHTML = '';
+               return;
+       }
+
+       pl = tinyMCEPopup.editor.plugins.moodlemedia._parse(pl);
+
+       if (!pl.src) {
+               p.innerHTML = '';
+               return;
+       }
+
+       pl.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(pl.src);
+       pl.width = !pl.width ? 100 : pl.width;
+       pl.height = !pl.height ? 100 : pl.height;
+    pl.id = !pl.id ? 'moodlemediaid' : pl.id;
+    pl.name = !pl.name ? 'moodlemedianame' : pl.name;
+       pl.align = !pl.align ? '' : pl.align;
+
+       // Avoid annoying warning about insecure items
+       if (!tinymce.isIE || document.location.protocol != 'https:') {
+               h += '<object classid="' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';
+
+               for (n in pl) {
+                       h += '<param name="' + n + '" value="' + pl[n] + '">';
+
+                       // Add extra url parameter if it's an absolute URL
+                       if (n == 'src' && pl[n].indexOf('://') != -1)
+                               h += '<param name="url" value="' + pl[n] + '" />';
+               }
+       }
+
+       h += '<embed type="' + type + '" ';
+
+       for (n in pl)
+               h += n + '="' + pl[n] + '" ';
+
+       h += '></embed>';
+
+       // Avoid annoying warning about insecure items
+       if (!tinymce.isIE || document.location.protocol != 'https:')
+               h += '</object>';
+
+       p.innerHTML = "<!-- x --->" + h;
+}
+
+tinyMCEPopup.onInit.add(init);
index 1916e1bfb98ab4b50965c5aa2ac0cbe5cec0a5f9..ee897c24334b09f331c9e0152d020a2a93e28016 100755 (executable)
@@ -1,52 +1,49 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
-<html xmlns="http://www.w3.org/1999/xhtml">\r
-<head>\r
-       <title>{#media_dlg.title}</title>\r
-       <script type="text/javascript" src="../../tiny_mce_popup.js"></script>\r
-       <script type="text/javascript" src="js/media.js"></script>\r
-       <script type="text/javascript" src="../../utils/mctabs.js"></script>\r
-       <script type="text/javascript" src="../../utils/validate.js"></script>\r
-       <script type="text/javascript" src="../../utils/form_utils.js"></script>\r
-       <script type="text/javascript" src="../../utils/editable_selects.js"></script>\r
-       <link href="css/media.css" rel="stylesheet" type="text/css" />\r
-</head>\r
-<body style="display: none">\r
-    <div class="tabs"></div>\r
-    <form onsubmit="insertMedia();return false;" action="#">\r
-               <div class="panel_wrapper">\r
-                       <div id="general_panel" class="panel current">\r
-                <input id="src" name="src" type="hidden" value="" class="mceFocus" onchange="generatePreview();" />\r
-                               <fieldset>\r
-                                       <legend>{#media_dlg.general}</legend>\r
-\r
-                                       <table align="center" border="0" cellpadding="4" cellspacing="0">\r
-                        <tr align="center">\r
-                            <td colspan='2' id="filebrowsercontainer">&nbsp;</td>\r
-                        </tr>\r
-                        <tr>\r
-                                                       <td><label for="src">{#media_dlg.filename}</label></td>\r
-                            <td><input id="filename" name="filename" type="text" value="" class="mceFocus" /></td>\r
-                        </tr>\r
-                                       </table>\r
-                               </fieldset>\r
-\r
-                               <fieldset>\r
-                                       <legend>{#media_dlg.preview}</legend>\r
-                                       <div id="prev"></div>\r
-                               </fieldset>\r
-                       </div>\r
-\r
-               </div>\r
-\r
-               <div class="mceActionPanel">\r
-                       <div style="float: left">\r
-                               <input type="submit" id="insert" name="insert" value="{#insert}" />\r
-                       </div>\r
-\r
-                       <div style="float: right">\r
-                               <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />\r
-                       </div>\r
-               </div>\r
-       </form>\r
-</body>\r
-</html>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+       <title>{#media_dlg.title}</title>
+       <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+       <script type="text/javascript" src="js/media.js"></script>
+       <script type="text/javascript" src="../../utils/mctabs.js"></script>
+       <script type="text/javascript" src="../../utils/validate.js"></script>
+       <script type="text/javascript" src="../../utils/form_utils.js"></script>
+       <script type="text/javascript" src="../../utils/editable_selects.js"></script>
+       <link href="css/media.css" rel="stylesheet" type="text/css" />
+</head>
+<body style="display: none">
+    <div class="tabs"></div>
+    <form onsubmit="insertMedia();return false;" action="#">
+               <div class="panel_wrapper">
+                       <div id="general_panel" class="panel current">
+                <input id="src" name="src" type="hidden" value="" class="mceFocus" onchange="generatePreview();" />
+                <input id="filename" name="filename" type="hidden" value="" />
+                               <fieldset>
+                                       <legend>{#media_dlg.general}</legend>
+
+                                       <table align="center" border="0" cellpadding="4" cellspacing="0">
+                        <tr align="center">
+                            <td colspan='2' id="filebrowsercontainer">&nbsp;</td>
+                        </tr>
+                                       </table>
+                               </fieldset>
+
+                               <fieldset>
+                                       <legend>{#media_dlg.preview}</legend>
+                                       <div id="prev"></div>
+                               </fieldset>
+                       </div>
+
+               </div>
+
+               <div class="mceActionPanel">
+                       <div style="float: left">
+                               <input type="submit" id="insert" name="insert" value="{#insert}" />
+                       </div>
+
+                       <div style="float: right">
+                               <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+                       </div>
+               </div>
+       </form>
+</body>
+</html>
index ead90dbc998ad38bba857f2c7a1569fd80bcc8af..31f18ee3fce0bc76e08d6a6864362815a0bda85e 100755 (executable)
@@ -81,7 +81,7 @@ class repository_upload extends repository {
      * @param bool $override override file if exists
      * @return mixed stored_file object or false if error; may throw exception if duplicate found
      */
-    public function upload_to_filepool($elname, $filearea='user_draft', $filepath='/', $itemid='', $filename = '', $override = false) {
+    public function upload_to_filepool($elname, $filearea='user_draft', $filepath='/', $itemid='', $filename = '', $override = true) {
         global $USER;
 
         if ($filepath !== '/') {