MDL-13766

1. Make mulit-filepicker in one page possible
2. fix lang strings
3. use itemid specify a draft file
TODO
itemid should use a better value.

diff --git a/lib/editor/tinymce.js.php b/lib/editor/tinymce.js.php
index f677d87312e27eea01347fba107ec72688f1cc45..8684d2a0050a5f55c7eb427a2ec7a66ce3af4518 100644 (file)
--- a/lib/editor/tinymce.js.php
+++ b/lib/editor/tinymce.js.php
@@ -196,10 +196,6 @@ $output .= <<<EOF
     function mce_toggleEditor(id) {
         tinyMCE.execCommand('mceToggleEditor',false,id);
     }
-    function mce_moodlefilemanager(field_name, url, type, win) {
-        var el = win.document.getElementById(field_name);
-        openpicker({'env':'editor','target':el});
-    }
     function mce_saveOnSubmit(id) {
         var prevOnSubmit = document.getElementById(id).form.onsubmit;
         document.getElementById(id).form.onsubmit = function() { 

diff --git a/lib/form/filepicker.php b/lib/form/filepicker.php
index e3884fccdb25c777a86f3f5cb8f25f4e3c829926..a35e8a64e5f99cef8f36bb680ed9525df37d67f8 100644 (file)
--- a/lib/form/filepicker.php
+++ b/lib/form/filepicker.php
@@ -44,18 +44,25 @@ class MoodleQuickForm_filepicker extends HTML_QuickForm_button
         if ($this->_flagFrozen) {
             return $this->getFrozenHtml();
         } else {
+            $strsaved = get_string('filesaved', 'repository');
+            $itemid = time();
             $ret = get_repository_client();
             $str = $this->_getTabs();
-            $str .= '<input type="hidden" value="" name="repo_attachment" id="repo_value" />';
+            $str .= '<input type="hidden" value="'.$itemid.'" name="repo_attachment" id="repo_value" />';
+            $suffix = $ret['suffix'];
             $str .= <<<EOD
 <script type="text/javascript">
-function callpicker(){
+function updatefile(){
+    alert('$strsaved');
+    document.getElementById('repo_info').innerHTML = '$strsaved';
+}
+function callpicker_$suffix(){
     var el=document.getElementById('repo_value');
-    openpicker({"env":"form", 'target':el})
+    openpicker_$suffix({"env":"form", 'itemid': $itemid, 'target':el, 'callback':updatefile})
 }
 </script>
 EOD;
-            $str .= '<input' . $this->_getAttrString($this->_attributes) . ' onclick=\'callpicker()\' />'.$ret['html'].$ret['js'];
+            $str .= '<input' . $this->_getAttrString($this->_attributes) . ' onclick=\'callpicker_'.$suffix.'()\' />'.'<span id="repo_info" style="color:green"></span>'.$ret['html'].$ret['js'];
             return $str;
         }
     }

diff --git a/lib/weblib.php b/lib/weblib.php
index d4f74fa4da760060e8daa21e9c1a7c425dfc1fe2..9190a214c18e333226b381bb873a30d153cd298e 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -4874,9 +4874,14 @@ function print_textarea($usehtmleditor, $rows, $cols, $width, $height, $name, $v
         // Show shortcuts button if HTML editor is in use, but only if JavaScript is enabled (MDL-9556)
         $ret = get_repository_client();
         $str .= $ret['html'].$ret['js'];
+        $suffix = $ret['suffix'];
         $str .= '<div class="textareaicons">';
         $str .= '<script type="text/javascript">
 //<![CDATA[
+function mce_moodlefilemanager(field_name, url, type, win) {
+    var el = win.document.getElementById(field_name);
+    openpicker_'.$suffix.'({"env":"editor","target":el});
+}
 mce_saveOnSubmit(\''.addslashes_js($id).'\');
 document.write(\''.addslashes_js($str_toggle).'\');
 document.write(\''.addslashes_js(editorshortcutshelpbutton()).'\');

diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php
index 60be09175dda60f7bea7a4b438da09be8e97f87b..384422842e25cef43d08f8907774ded0627772c4 100755 (executable)
--- a/repository/boxnet/repository.class.php
+++ b/repository/boxnet/repository.class.php
@@ -101,7 +101,7 @@ class repository_boxnet extends repository{
             $ret['list']   = $list;
             return $ret;
         } else {
-            throw new repository_exception('nullfilelist', 'repository');
+            throw new repository_exception('nullfilelist', 'repository_boxnet');
         }
     }
 

diff --git a/repository/flickr/lang/en_utf8/repository_flickr.php b/repository/flickr/lang/en_utf8/repository_flickr.php
index 43135b895da2c1fc01a57ae4620395f8e0265ec9..c5c55c26325b1b3a236f1112205312e94f8c5bc6 100644 (file)
--- a/repository/flickr/lang/en_utf8/repository_flickr.php
+++ b/repository/flickr/lang/en_utf8/repository_flickr.php
@@ -4,3 +4,5 @@ $string['repositorydesc'] = 'Repository for flickr.com';
 $string['notitle'] = 'notitle';
 $string['username'] = 'Flickr Account:';
 $string['remember'] = 'Remember me';
+$string['nullphotolist'] = 'There is no photo belong to this account.';
+$string['invalidemail'] = 'Invalid Flickr email address.';

diff --git a/repository/flickr/repository.class.php b/repository/flickr/repository.class.php
index 220215a8f34413a3b053c3cf3ba69ee38a12e791..837373d346b1aaa24b492264632bf01f16d26c55 100755 (executable)
--- a/repository/flickr/repository.class.php
+++ b/repository/flickr/repository.class.php
@@ -49,7 +49,7 @@ class repository_flickr extends repository{
                         $action = 'list';
                     }
                 } else {
-                    throw new repository_exception('invalidemail', 'repository');
+                    throw new repository_exception('invalidemail', 'repository_flickr');
                 }
             } else {
                 if($account = get_user_preferences('flickrmail', '')){
@@ -126,7 +126,7 @@ EOD;
                 array('title'=>$p['title'],'source'=>$p['id'],'id'=>$p['id'],'thumbnail'=>$this->flickr->buildPhotoURL($p, 'Square'), 'date'=>'', 'size'=>'unknown');
         }
         if(empty($ret)) {
-            throw new repository_exception('nullphotolist', 'repository');
+            throw new repository_exception('nullphotolist', 'repository_flickr');
         } else {
             return $ret;
         }

diff --git a/repository/lib.php b/repository/lib.php
index d3ba659c12e2e80a6a9af402b9a79f98cb5e0723..e9ec9614745b911c407273bb6d6df77234fa57a8 100644 (file)
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -332,7 +332,7 @@ function repository_get_plugins(){
     return $ret;
 }
 
-function move_to_filepool($path, $name) {
+function move_to_filepool($path, $name, $itemid) {
     global $DB, $CFG, $USER;
     $context = get_context_instance(CONTEXT_USER, $USER->id);
     $entry = new object();
@@ -342,7 +342,11 @@ function move_to_filepool($path, $name) {
     $entry->filepath  = '/';
     $entry->timecreated  = time();
     $entry->timemodified = time();
-    $entry->itemid       = $USER->id;
+    if(is_numeric($itemid)) {
+        $entry->itemid = $itemid;
+    } else {
+        $entry->itemid = 0;
+    }
     $entry->mimetype     = mimeinfo('type', $path);
     $entry->userid       = $USER->id;
     $fs = get_file_storage();
@@ -352,9 +356,7 @@ function move_to_filepool($path, $name) {
         $ret = $browser->get_file_info($context, $file->get_filearea(), $file->get_itemid(), $file->get_filepath(), $file->get_filename());
         // TODO
         // get_params should include id value, talk to Petr.
-        $params = $ret->get_params();
-        $params['id'] = 88;
-        return array('url'=>$ret->get_url(),'id'=>$params['id']);
+        return array('url'=>$ret->get_url(),'id'=>$file->get_itemid());
     } else {
         return null;
     }
@@ -363,6 +365,7 @@ function move_to_filepool($path, $name) {
 
 function get_repository_client(){
     global $CFG;
+    $suffix = uniqid();
     $strsubmit    = get_string('submit', 'repository');
     $strlistview  = get_string('listview', 'repository');
     $strthumbview = get_string('thumbview', 'repository');
@@ -410,7 +413,7 @@ function get_repository_client(){
     <script type="text/javascript" src="$CFG->wwwroot/lib/yui/button/button-min.js"></script>
     <script type="text/javascript" src="$CFG->wwwroot/lib/yui/selector/selector-beta-min.js"></script>
     <script>
-    var repository_client = (function() {
+    var repository_client_$suffix = (function() {
         // private static field
         var dver = '1.0';
         // private static methods
@@ -419,7 +422,7 @@ function get_repository_client(){
         }
         function _client(){
             // public varible
-            this.name = 'repository_client';
+            this.name = 'repository_client_$suffix';
             // private varible
             var Dom = YAHOO.util.Dom, Event = YAHOO.util.Event, layout = null, resize = null;
             var IE_QUIRKS = (YAHOO.env.ua.ie && document.compatMode == "BackCompat");
@@ -430,7 +433,7 @@ function get_repository_client(){
             var select = new YAHOO.util.Element('select');
             var list = null;
             var resize = null;
-            var panel = new YAHOO.widget.Panel('file-picker', {
+            var panel = new YAHOO.widget.Panel('file-picker-$suffix', {
                 draggable: true,
                 close: true,
                 underlay: 'none',
@@ -458,7 +461,7 @@ function get_repository_client(){
                         layout.render();
                     });
                 });
-                resize = new YAHOO.util.Resize('file-picker', {
+                resize = new YAHOO.util.Resize('file-picker-$suffix', {
                     handles: ['br'],
                     autoRatio: true,
                     status: true,
@@ -503,7 +506,7 @@ function get_repository_client(){
                         li = document.createElement('ul');
                         li.innerHTML = '<a href="###" id="repo-call-'+repo.id+'">'+
                             repo.repositoryname+'</a><br/>';
-                        li.innerHTML += '<a href="###" class="repo-opt" onclick="repository_client.search('+repo.id+')">$strsearch</a>';
+                        li.innerHTML += '<a href="###" class="repo-opt" onclick="repository_client_$suffix.search('+repo.id+')">$strsearch</a>';
                         li.innerHTML += '<a href="###" class="repo-opt" id="repo-logout-'+repo.id+'">$strlogout</a>';
                         li.id = 'repo-'+repo.id;
                         this.appendChild(li);
@@ -511,13 +514,13 @@ function get_repository_client(){
                         e.on('click', function(e){
                             var re = /repo-call-(\d+)/i;
                             var id = this.get('id').match(re);
-                            repository_client.req(id[1], 1, 0);
+                            repository_client_$suffix.req(id[1], 1, 0);
                             });
                         e = new YAHOO.util.Element('repo-logout-'+repo.id);
                         e.on('click', function(e){
                             var re = /repo-logout-(\d+)/i;
                             var id = this.get('id').match(re);
-                            repository_client.req(id[1], 1, 1);
+                            repository_client_$suffix.req(id[1], 1, 1);
                             });
                         repo = null;
                     }
@@ -558,8 +561,8 @@ function get_repository_client(){
             html += '<label for="syncfile">$strsync</label>';
             html += '<input type="checkbox" id="syncfile" /><br/>';
             html += '<input type="hidden" id="fileurl" value="'+url+'" />';
-            html += '<input type="button" onclick="repository_client.download()" value="$strdownload" />';
-            html += '<a href="###" onclick="repository_client.viewfiles()">$strback</a>';
+            html += '<input type="button" onclick="repository_client_$suffix.download()" value="$strdownload" />';
+            html += '<a href="###" onclick="repository_client_$suffix.viewfiles()">$strback</a>';
             html += '</div>';
             panel.get('element').innerHTML = html;
         }
@@ -585,7 +588,7 @@ function get_repository_client(){
                 str += '<input type="'+data[k].type+'"'+' name="'+data[k].name+'"'+field_id+field_value+' />';
                 str += '</p>';
             }
-            str += '<p><input type="button" onclick="repository_client.login()" value="$strsubmit" /></p>';
+            str += '<p><input type="button" onclick="repository_client_$suffix.login()" value="$strsubmit" /></p>';
             panel.get('element').innerHTML = str;
         }
 
@@ -609,7 +612,7 @@ function get_repository_client(){
                 str += '<div style="text-align:center">';
                 str += ('<input type="radio" title="'+obj[k].title
                         +'" name="selected-files" value="'+obj[k].source
-                        +'" onclick=\'repository_client.rename("'+obj[k].title+'", "'
+                        +'" onclick=\'repository_client_$suffix.rename("'+obj[k].title+'", "'
                         +obj[k].source+'")\' />');
                 str += obj[k].title+'</div>';
                 str += '</div>';
@@ -628,7 +631,7 @@ function get_repository_client(){
             var re = new RegExp();
             re.compile("^[A-Za-z]+://[A-Za-z0-9-_]+\\.[A-Za-z0-9-_%&\?\/.=]+$");
             for(k in obj){
-                str += ('<input type="radio" title="'+obj[k].title+'" name="selected-files" value="'+obj[k].source+'" onclick=\'repository_client.rename("'+obj[k].title+'", "'+obj[k].source+'")\' /> ');
+                str += ('<input type="radio" title="'+obj[k].title+'" name="selected-files" value="'+obj[k].source+'" onclick=\'repository_client_$suffix.rename("'+obj[k].title+'", "'+obj[k].source+'")\' /> ');
                 if(re.test(obj[k].source)) {
                     str += '<a class="file_name" href="'+obj[k].source+'">'+obj[k].title+'</a>';
                 } else {
@@ -649,7 +652,7 @@ function get_repository_client(){
             if(_client.datasource.pages){
                 str += '<div id="paging">';
                 for(var i = 1; i <= _client.datasource.pages; i++) {
-                    str += '<a onclick="repository_client.req('+_client.repositoryid+', '+i+', 0)" href="###">';
+                    str += '<a onclick="repository_client_$suffix.req('+_client.repositoryid+', '+i+', 0)" href="###">';
                     str += String(i);
                     str += '</a> ';
                 }
@@ -660,10 +663,15 @@ function get_repository_client(){
         _client.download = function(){
             var title = document.getElementById('newname').value;
             var file = document.getElementById('fileurl').value;
+            var itemid = 0;
+            if(_client.itemid){
+                itemid = _client.itemid;
+            }
             _client.loading();
             var trans = YAHOO.util.Connect.asyncRequest('POST', 
-                '$CFG->wwwroot/repository/ws.php?repo_id='+_client.repositoryid+'&action=download', 
-                _client.dlfile, _client.postdata({'env':_client.env, 'file':file, 'title':title}));
+                '$CFG->wwwroot/repository/ws.php?repo_id='+_client.repositoryid+
+                    '&action=download', 
+                _client.dlfile, _client.postdata({'itemid': itemid, 'env':_client.env, 'file':file, 'title':title}));
         }
         _client.login = function(){
             var obj = {};
@@ -685,6 +693,7 @@ function get_repository_client(){
         }
         _client.end = function(str){
             _client.target.value = str;
+            _client.formcallback();
             _client.viewfiles();
         }
         _client.callback = {
@@ -724,8 +733,7 @@ function get_repository_client(){
                     return;
                 }
                 var html = '<h1>Download Successfully!</h1>';
-                //html += '<a href="###" onclick="repository_client.viewfiles()">Back</a>';
-                html += '<a href="###" onclick="repository_client.end(\''+ret+'\')">Add!</a>';
+                html += '<button onclick="repository_client_$suffix.end(\''+ret+'\')">Add!</button>';
                 panel.get('element').innerHTML = html;
             }
         }
@@ -752,27 +760,35 @@ EOD;
 
     $repos = repository_instances();
     foreach($repos as $repo) {
-        $js .= 'repository_client.repos.push('.json_encode($repo).');'."\n";
+        $js .= 'repository_client_'.$suffix.'.repos.push('.json_encode($repo).');'."\n";
         $js .= "\n";
     }
 
     $js .= <<<EOD
-    function openpicker(obj) {
-        if(!repository_client.instance) {
-            repository_client.env = obj.env;
-            repository_client.target = obj.target;
-            repository_client.instance = new repository_client();
-            repository_client.instance.create_picker();
+    function openpicker_$suffix(obj) {
+        if(!repository_client_$suffix.instance) {
+            repository_client_$suffix.env = obj.env;
+            repository_client_$suffix.target = obj.target;
+            repository_client_$suffix.instance = new repository_client_$suffix();
+            repository_client_$suffix.instance.create_picker();
+            if(obj.itemid){
+                repository_client_$suffix.itemid = obj.itemid;
+            }
+            if(obj.callback){
+                repository_client_$suffix.formcallback = obj.callback;
+            } else {
+                repository_client_$suffix.formcallback = function(){};
+            }
         } else {
-            repository_client.instance.show();
+            repository_client_$suffix.instance.show();
         }
     }
     </script>
 EOD;
     $html = <<<EOD
     <div class='yui-skin-sam'>
-        <div id="file-picker"></div>
+        <div id="file-picker-$suffix"></div>
     </div>
 EOD;
-    return array('html'=>$html, 'js'=>$js);
+    return array('html'=>$html, 'js'=>$js, 'suffix'=>$suffix);
 }

diff --git a/repository/ws.php b/repository/ws.php
index aec4ecde1e3c153ac404a1bb9b5c05a0268fd54f..d9568b99deb1bb9c35f453fd56d89c48a66b1d9b 100644 (file)
--- a/repository/ws.php
+++ b/repository/ws.php
@@ -17,6 +17,7 @@ $action = optional_param('action', '', PARAM_RAW);
 $search = optional_param('s', '', PARAM_RAW);
 // id of repository
 $repo_id = optional_param('repo_id', 1, PARAM_INT);
+$itemid  = optional_param('itemid',  0, PARAM_INT);
 
 if(!$repository = $DB->get_record('repository', array('id'=>$repo_id))) {
     $err = new stdclass;
@@ -61,7 +62,7 @@ if($action == 'list') {
 } elseif($action == 'download') {
     $path = $repo->get_file($file, $title);
     try {
-        $info = move_to_filepool($path, $title);
+        $info = move_to_filepool($path, $title, $itemid);
         if($env == 'form'){
             echo json_encode($info['id']);
         } elseif($env == 'editor') {
@@ -72,6 +73,10 @@ if($action == 'list') {
         $err = new stdclass;
         $err->e = $e->getMessage();
         die(json_encode($err));
+    } catch (Exception $e) {
+        $err = new stdclass;
+        $err->e = $e->getMessage();
+        die(json_encode($err));
     }
 } else {
     try {