From 99eaca9d3d9cd2b42fd8586bbb65dec125b12379 Mon Sep 17 00:00:00 2001
From: Dongsheng Cai <unoter@gmail.com>
Date: Fri, 15 Jan 2010 07:48:38 +0000
Subject: [PATCH] "MDL-21170, major update to filepicker, complete rewrote
 filepicker javascript code to use YUI3, need furthur polish"

---
 lang/en_utf8/repository.php                   |    1 +
 lib/ajax/ajaxlib.php                          |   22 +-
 lib/editor/tinymce/extra/tinymce_utils.js     |   27 +-
 lib/filelib.php                               |   11 +-
 lib/form/editor.php                           |   27 +-
 lib/form/filemanager.js                       |   17 +
 lib/form/filemanager.php                      |   60 +-
 lib/form/filepicker.js                        |   33 +-
 lib/form/filepicker.php                       |   30 +-
 lib/javascript-static.js                      |    5 +-
 repository/boxnet/repository.class.php        |    2 +-
 repository/filepicker.js                      | 1086 ++++++++++++++
 repository/flickr_public/repository.class.php |   61 +-
 repository/lib.php                            |  272 ++--
 repository/repository.js                      |    1 -
 repository/repository.src.js                  | 1314 -----------------
 repository/repository_ajax.php                |   23 +-
 17 files changed, 1378 insertions(+), 1614 deletions(-)
 create mode 100644 repository/filepicker.js
 delete mode 100644 repository/repository.js
 delete mode 100644 repository/repository.src.js

diff --git a/lang/en_utf8/repository.php b/lang/en_utf8/repository.php
index a754e4824b1..404e6adc2fb 100644
--- a/lang/en_utf8/repository.php
+++ b/lang/en_utf8/repository.php
@@ -117,6 +117,7 @@ $string['submit'] = 'Submit';
 $string['sync'] = 'Sync';
 $string['title'] = 'Choose a file...';
 $string['thumbview'] = 'View as icons';
+$string['iconview'] = 'View as icons';
 $string['typenotvisible'] = 'Type not visible';
 $string['updown'] = 'Display order';
 $string['upload'] = 'Upload this file';
diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php
index d5a38653319..ac886d69d87 100644
--- a/lib/ajax/ajaxlib.php
+++ b/lib/ajax/ajaxlib.php
@@ -166,6 +166,8 @@ class page_requirements_manager {
         $this->yui2_lib('dom');        // needs to be migrated to YUI3 before we release 2.0
         $this->yui2_lib('container');  // needs to be migrated to YUI3 before we release 2.0
         $this->yui2_lib('connection'); // needs to be migrated to YUI3 before we release 2.0
+        // File Picker use this module loading YUI2 widgets
+        $this->yui2_lib('yuiloader');  // needs to be migrated to YUI3 before we release 2.0
 
         $this->string_for_js('confirmation', 'admin');
         $this->string_for_js('cancel', 'moodle');
@@ -603,14 +605,22 @@ class page_requirements_manager {
 
         $ondomreadyjs = $this->get_javascript_code(self::WHEN_ON_DOM_READY, '    ');
 
+        $pathtofilepicker = $CFG->httpswwwroot.'/repository/filepicker.js';
+
         $js .= <<<EOD
-Y = YUI({
-    base: moodle_cfg.yui3loaderBase
-}).use('node-base', function(Y) {
-    Y.on('domready', function() {
-    $ondomreadyjs
+\n
+    Y = YUI({
+        base: moodle_cfg.yui3loaderBase,
+        combine: true,
+        comboBase: moodle_cfg.yui3loaderComboBase,
+        modules: {
+            'filepicker':{fullpath:'$pathtofilepicker', 'requires':['base', 'node', 'json', 'async-queue', 'io']}
+        }
+    }).use('node-base', function(Y) {
+        Y.on('domready', function() {
+        $ondomreadyjs
+        });
     });
-});
 EOD;
 
         $output .= ajax_generate_script_tag($js);
diff --git a/lib/editor/tinymce/extra/tinymce_utils.js b/lib/editor/tinymce/extra/tinymce_utils.js
index 0b8b33c064a..2f81a7abc12 100644
--- a/lib/editor/tinymce/extra/tinymce_utils.js
+++ b/lib/editor/tinymce/extra/tinymce_utils.js
@@ -47,12 +47,23 @@ function mce_saveOnSubmit(id) {
     };
 }
 
-function mce_moodlefilemanager(field_name, url, type, win) {
-    var client_id = id2clientid[tinyMCE.selectedInstance.editorId];
-    var picker = document.createElement('DIV');
-    picker.className = "file-picker";
-    picker.id = 'file-picker-'+client_id;
-    document.body.appendChild(picker);
-    var el = win.document.getElementById(field_name);
-    open_filepicker(client_id, {"env":"editor","target":el,"filetype":type, "savepath":"/"});
+var editor_filepickers = {};
+var editor_options = {};
+function editor_filepicker_callback(args) {
+}
+function editor_init_filepicker(editorid, options) {
+    editor_options[editorid] = options;
+}
+function mce_moodlefilemanager(target_id, url, type, win) {
+    Y.use("filepicker", function (Y) {
+        var editor_id = tinyMCE.selectedInstance.editorId;
+        var options = editor_options[editor_id];
+        var client_id = options.client_id;
+        options.formcallback = editor_filepicker_callback;
+        options.editor_target = win.document.getElementById(target_id);
+        if (!editor_filepickers[client_id]) {
+            editor_filepickers[client_id] = new Y.filepicker(options); 
+        }
+        editor_filepickers[client_id].show();
+    });
 }
diff --git a/lib/filelib.php b/lib/filelib.php
index f89fda89de4..64fa743ab03 100644
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -2229,7 +2229,7 @@ class curl {
         // sends as part of the HTTP header (note this is recursive,
         // PHP will follow as many "Location: " headers that it is sent,
         // unless CURLOPT_MAXREDIRS is set).
-        $this->options['CURLOPT_FOLLOWLOCATION']    = 1;
+        //$this->options['CURLOPT_FOLLOWLOCATION']    = 1;
         $this->options['CURLOPT_MAXREDIRS']         = 10;
         $this->options['CURLOPT_ENCODING']          = '';
         // TRUE to return the transfer as a string of the return
@@ -2764,7 +2764,7 @@ class curl_cache {
  * @copyright 2009 Dongsheng Cai <dongsheng@moodle.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class file_type_to_ext {
+class filetype_parser {
     /**
      * Check file_types.mm file, setup variables
      *
@@ -2826,7 +2826,10 @@ class file_type_to_ext {
      * @param array $types
      * @return mixed
      */
-    public function get_file_ext($types) {
+    public function get_extensions($types) {
+        if (!is_array($types)) {
+            $types = array($types);
+        }
         $this->result = array();
         if ((is_array($types) && in_array('*', $types)) ||
             $types == '*' || empty($types)) {
@@ -2848,7 +2851,7 @@ class file_type_to_ext {
                 }
             }
         } else {
-            exit('Failed to open test.xml.');
+            exit('Failed to open file');
         }
         return $this->result;
     }
diff --git a/lib/form/editor.php b/lib/form/editor.php
index 98000aa6dee..e5b59e4abc9 100644
--- a/lib/form/editor.php
+++ b/lib/form/editor.php
@@ -18,7 +18,8 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
     protected $_values     = array('text'=>null, 'format'=>null, 'itemid'=>null);
 
     function MoodleQuickForm_editor($elementName=null, $elementLabel=null, $attributes=null, $options=null) {
-        global $CFG;
+        global $CFG, $PAGE;
+        $PAGE->requires->js('lib/form/filepicker.js');
 
         $options = (array)$options;
         foreach ($options as $name=>$value) {
@@ -35,7 +36,6 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
         $this->_options['trusted'] = trusttext_trusted($this->_options['context']);
         parent::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
 
-        repository_head_setup();
         editors_head_setup();
     }
 
@@ -114,6 +114,7 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
 
     function toHtml() {
         global $CFG, $COURSE, $PAGE;
+        require_once($CFG->dirroot.'/repository/lib.php');
 
         if ($this->_flagFrozen) {
             return $this->getFrozenHtml();
@@ -177,13 +178,25 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
             $str .= '<object type="text/html" data="'.$editorurl.'" height="160" width="600" style="border:1px solid #000">Error</object>'; // TODO: localise, fix styles, etc.
             $str .= '</div>';
 
-            require_once($CFG->dirroot.'/repository/lib.php');
             $client_id = uniqid();
-            $repojs = repository_get_client($ctx, $client_id, array('image', 'video', 'media'), (FILE_EXTERNAL | FILE_INTERNAL));
 
-            $str .= $repojs;
-            $str .= $PAGE->requires->js_function_call('id2_add_clientid', array($id, $client_id))->asap();
-            $str .= $PAGE->requires->js_function_call('id2_add_itemid', array($id, $draftitemid))->asap();
+            $args = new stdclass;
+            // need these three to filter repositories list
+            $args->accepted_types = array('image', 'video', 'media');
+            $args->return_types = (FILE_INTERNAL | FILE_EXTERNAL);
+            $args->context = $ctx;
+            $args->env = 'filepicker';
+
+            $options = initialise_filepicker($args);
+
+            $options->client_id = $client_id;
+            $options->maxbytes = $this->_options['maxbytes'];
+            $options->maxfiles = 1;
+            $options->env = 'editor';
+
+            //$PAGE->requires->js_function_call('id2_add_clientid', array($id, $client_id))->on_dom_ready();
+            //$PAGE->requires->js_function_call('id2_add_itemid', array($id, $draftitemid))->on_dom_ready();
+            $PAGE->requires->js_function_call('editor_init_filepicker', array($id, $options))->on_dom_ready();
 
             if ($editor->supports_repositories()) {
                 $str .= $PAGE->requires->js_function_call('destroy_item', array("{$id}_filemanager"))->asap();
diff --git a/lib/form/filemanager.js b/lib/form/filemanager.js
index d62752e6358..c2f73e90e86 100644
--- a/lib/form/filemanager.js
+++ b/lib/form/filemanager.js
@@ -88,6 +88,23 @@ function filemanager_callback(params) {
     }
 }
 
+var fm_filepickers = {};
+function fp_filepicker_callback(params) {
+    var html = '<a href="'+params['file']+'">'+params['title']+'</a>';
+    document.getElementById('file_info_'+params['client_id']).innerHTML = html;
+}
+
+function fm_init_filepicker(id, options) {
+    Y.use("filepicker", function (Y) {
+        options.formcallback = filemanager_callback;
+        if (!pickers[options.client_id]) {
+            fm_filepickers[options.client_id] = new Y.filepicker(options); 
+        }
+        Y.one('#'+id).on('click', function(e, client_id) {
+            fm_filepickers[options.client_id].show();
+        }, this, options.client_id);
+    });
+}
 /**
  * Setup options to launch file picker.
  * Fired by add file button.
diff --git a/lib/form/filemanager.php b/lib/form/filemanager.php
index 5bb90bf99c5..92735d0b0dc 100644
--- a/lib/form/filemanager.php
+++ b/lib/form/filemanager.php
@@ -27,19 +27,14 @@ global $CFG;
 
 require_once('HTML/QuickForm/element.php');
 require_once($CFG->dirroot.'/lib/filelib.php');
+require_once("$CFG->dirroot/repository/lib.php");
 
 class MoodleQuickForm_filemanager extends HTML_QuickForm_element {
     public $_helpbutton = '';
-    protected $_options    = array('mainfile'=>'', 'subdirs'=>0, 'maxbytes'=>0, 'maxfiles'=>-1, 'filetypes'=>'*', 'returntypes'=>FILE_INTERNAL);
+    protected $_options    = array('mainfile'=>'', 'subdirs'=>0, 'maxbytes'=>0, 'maxfiles'=>-1, 'accepted_types'=>'*', 'return_types'=>FILE_INTERNAL);
 
     function MoodleQuickForm_filemanager($elementName=null, $elementLabel=null, $attributes=null, $options=null) {
         global $CFG, $PAGE;
-        require_once("$CFG->dirroot/repository/lib.php");
-
-        // has to require these js files before head
-        $PAGE->requires->yui2_lib('menu');
-        $PAGE->requires->yui2_lib('connection');
-        $PAGE->requires->yui2_lib('json');
 
         $options = (array)$options;
         foreach ($options as $name=>$value) {
@@ -51,8 +46,8 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element {
             $this->_options['maxbytes'] = get_max_upload_file_size($CFG->maxbytes, $options['maxbytes']);
         }
         parent::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
-
-        repository_head_setup();
+        $PAGE->requires->js('repository/filepicker.js');
+        $PAGE->requires->js('lib/form/filemanager.js');
     }
 
     function setName($name) {
@@ -130,12 +125,14 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element {
         $subdirs     = $this->_options['subdirs'];
         $maxbytes    = $this->_options['maxbytes'];
         $draftitemid = $this->getValue();
+        $accepted_types = $this->_options['accepted_types'];
 
         // language strings
         $straddfile  = get_string('add', 'repository') . '...';
         $strmakedir  = get_string('makeafolder', 'moodle');
         $strdownload  = get_string('downloadfolder', 'repository');
 
+
         $PAGE->requires->string_for_js('loading', 'repository');
         $PAGE->requires->string_for_js('nomorefiles', 'repository');
         $PAGE->requires->string_for_js('confirmdeletefile', 'repository');
@@ -168,17 +165,22 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element {
 
         $draftareainfo = file_get_draft_area_info($draftitemid);
         $filecount = $draftareainfo['filecount'];
-
-        if ($COURSE->id == SITEID) {
-            $context = get_context_instance(CONTEXT_SYSTEM);
-        } else {
-            $context = get_context_instance(CONTEXT_COURSE, $COURSE->id);
-        }
-
         $client_id = uniqid();
 
+        $args = new stdclass;
+        // need these three to filter repositories list
+        $args->accepted_types = $accepted_types;
+        $args->return_types = $this->_options['return_types'];
+        $args->context = $PAGE->context;
+        $args->env = 'filemanager';
+
+        $filepicker_options = initialise_filepicker($args);
+
+        $filepicker_options->client_id = $client_id;
+        $filepicker_options->maxbytes = $this->_options['maxbytes'];
+        $filepicker_options->maxfiles = $this->_options['maxfiles'];
+
         // Generate file picker
-        $repojs = repository_get_client($context, $client_id, $this->_options['filetypes'], $this->_options['returntypes']);
         $result = new stdclass;
 
         $options = file_get_draft_area_files($draftitemid);
@@ -192,11 +194,9 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element {
         $options->target    = $id;
 
         $html = $this->_getTabs();
-        $html .= $repojs;
 
-        if (empty($CFG->filemanagerjsloaded)) {
-            $PAGE->requires->js('lib/form/filemanager.js');
-            $CFG->filemanagerjsloaded = true;
+        if (empty($CFG->filemanagertemplateloaded)) {
+            $CFG->filemanagertemplateloaded = true;
             // print html template
             $html .= <<<FMHTML
 <div id="fm-template" style="display:none"><div class="fm-file-menu">___action___</div> <div class="fm-file-name">___fullname___</div></div>
@@ -212,7 +212,6 @@ FMHTML;
         <a href="###" id="btncrt-{$client_id}">{$strmakedir}</a>
         <a href="###" id="btndwn-{$client_id}">{$strdownload}</a>
     </div>
-
     <div class="filemanager-container" id="filemanager-{$client_id}">
         <ul id="draftfiles-{$client_id}">
             <li>Loading...</li>
@@ -221,16 +220,17 @@ FMHTML;
 </div>
 FMHTML;
         // non-javascript file manager, will be destroied automatically if javascript is enabled.
-        $html .= '<div id="nonjs-filemanager-'.$client_id.'">';
-        $editorurl = "$CFG->wwwroot/repository/filepicker.php?env=filemanager&amp;action=embedded&amp;itemid=$draftitemid&amp;subdirs=/&amp;maxbytes=$options->maxbytes&amp;ctx_id=".$context->id;
-        $html .= '<object type="text/html" data="'.$editorurl.'" height="160" width="600" style="border:1px solid #000">Error</object>';
-        $html .= '</div>';
+        $editorurl = "$CFG->wwwroot/repository/filepicker.php?env=filemanager&amp;action=embedded&amp;itemid=$draftitemid&amp;subdirs=/&amp;maxbytes=$options->maxbytes&amp;ctx_id=".$PAGE->context->id;
+        $html .= <<<NONJS
+<div id="nonjs-filemanager-$client_id">';
+<object type="text/html" data="$editorurl" height="160" width="600" style="border:1px solid #000">Error</object>';
+</div>
+NONJS;
 
-        $html .= $PAGE->requires->js_function_call('destroy_item', array("nonjs-filemanager-{$client_id}"))->asap();
-        $html .= $PAGE->requires->js_function_call('show_item', array("filemanager-wrapper-{$client_id}"))->asap();
+        $PAGE->requires->js_function_call('destroy_item', array("nonjs-filemanager-{$client_id}"))->on_dom_ready();
+        $PAGE->requires->js_function_call('show_item', array("filemanager-wrapper-{$client_id}"))->on_dom_ready();
         $PAGE->requires->js_function_call('launch_filemanager', array($client_id, $options))->on_dom_ready();
-
+        $PAGE->requires->js_function_call('fm_init_filepicker', array('btnadd-'.$client_id, $filepicker_options))->on_dom_ready();
         return $html;
     }
-
 }
diff --git a/lib/form/filepicker.js b/lib/form/filepicker.js
index 7ad7d241772..f2c9058d5cc 100644
--- a/lib/form/filepicker.js
+++ b/lib/form/filepicker.js
@@ -1,24 +1,17 @@
-function filepicker_callback(params) {
-    var html = '<a href="'+params['url']+'">'+params['file']+'</a>';
-    // TODO: support delete the draft file
+var pickers = {};
+function fp_filepicker_callback(params) {
+    var html = '<a href="'+params['file']+'">'+params['title']+'</a>';
     document.getElementById('file_info_'+params['client_id']).innerHTML = html;
 }
 
-// launch file picker from filepicker element
-function launch_filepicker(id, client_id, itemid) {
-    var picker = document.createElement('DIV');
-    picker.id = 'file-picker-'+client_id;
-    picker.className = 'file-picker';
-    document.body.appendChild(picker);
-    var el=document.getElementById(id);
-    var params = {};
-    params.env = 'filepicker';
-    params.itemid = itemid;
-    params.maxbytes = filepicker.maxbytes;
-    params.maxfiles = filepicker.maxfiles;
-    params.savepath = '/';
-    params.target = el;
-    params.callback = filepicker_callback;
-    var fp = open_filepicker(client_id, params);
-    return false;
+function fp_init_filepicker(id, options) {
+    Y.use("filepicker", function (Y) {
+        options.formcallback = fp_filepicker_callback;
+        if (!pickers[options.client_id]) {
+            pickers[options.client_id] = new Y.filepicker(options); 
+        }
+        Y.one('#'+id).on('click', function(e, client_id) {
+            pickers[options.client_id].show();
+        }, this, options.client_id);
+    });
 }
diff --git a/lib/form/filepicker.php b/lib/form/filepicker.php
index 6f2a3ecae78..7b17c1567f6 100644
--- a/lib/form/filepicker.php
+++ b/lib/form/filepicker.php
@@ -15,11 +15,10 @@ require_once($CFG->dirroot.'/repository/lib.php');
  */
 class MoodleQuickForm_filepicker extends HTML_QuickForm_input {
     public $_helpbutton = '';
-    protected $_options    = array('maxbytes'=>0, 'filetypes'=>'*', 'returntypes'=>FILE_INTERNAL);
+    protected $_options    = array('maxbytes'=>0, 'accepted_types'=>'*', 'return_types'=>FILE_INTERNAL);
 
     function MoodleQuickForm_filepicker($elementName=null, $elementLabel=null, $attributes=null, $options=null) {
         global $CFG;
-        require_once("$CFG->dirroot/repository/lib.php");
 
         $options = (array)$options;
         foreach ($options as $name=>$value) {
@@ -31,8 +30,6 @@ class MoodleQuickForm_filepicker extends HTML_QuickForm_input {
             $this->_options['maxbytes'] = get_max_upload_file_size($CFG->maxbytes, $options['maxbytes']);
         }
         parent::HTML_QuickForm_input($elementName, $elementLabel, $attributes);
-
-        repository_head_setup();
     }
 
     function setHelpButton($helpbuttonargs, $function='helpbutton') {
@@ -81,31 +78,46 @@ class MoodleQuickForm_filepicker extends HTML_QuickForm_input {
         } else {
             $context = get_context_instance(CONTEXT_COURSE, $COURSE->id);
         }
+
         $client_id = uniqid();
-        $repojs = repository_get_client($context, $client_id, $this->_options['filetypes'], $this->_options['returntypes']);
-        $PAGE->requires->data_for_js('filepicker', array('maxbytes'=>$this->_options['maxbytes'],'maxfiles'=>1));
         $PAGE->requires->js('lib/form/filepicker.js');
 
+        $args = new stdclass;
+        // need these three to filter repositories list
+        $args->accepted_types = $this->_options['accepted_types']?$this->_options['accepted_types']:'*';
+        $args->return_types = FILE_INTERNAL;
+        $args->context = $PAGE->context;
+        $args->env = 'filepicker';
+
+        $options = initialise_filepicker($args);
+
+        $options->client_id = $client_id;
+        $options->maxbytes = $this->_options['maxbytes'];
+        $options->maxfiles = 1;
+
         $id     = $this->_attributes['id'];
         $elname = $this->_attributes['name'];
 
         $str = $this->_getTabs();
         $str .= '<input type="hidden" name="'.$elname.'" id="'.$id.'" '.$draftvalue.' />';
-        $str .= $repojs;
 
         $str .= <<<EOD
 <div id="filepicker-wrapper-{$client_id}" style="display:none">
     <div class="filemanager-toolbar">
-        <a href="###" onclick="return launch_filepicker('$id', '$client_id', '$draftitemid')">$straddfile</a>
+        <a href="###" id="filepicker-button-{$client_id}">$straddfile</a>
     </div>
     <div id="file_info_{$client_id}" class="mdl-left">$currentfile</div>
 </div>
+<!-- non javascript file picker -->
 <noscript>
-<object type="text/html" id="nonjs-filepicker-{$client_id}" data="{$CFG->httpswwwroot}/repository/filepicker.php?env=filepicker&amp;action=embedded&amp;itemid={$draftitemid}&amp;ctx_id=$context->id" height="300" width="800" style="border:1px solid #000">Error</object>
+<object type="text/html" id="nonjs-filepicker-{$client_id}" data="{$CFG->httpswwwroot}/repository/filepicker.php?env=filepicker&amp;action=embedded&amp;itemid={$draftitemid}&amp;ctx_id=$context->id" height="300" width="800" style="border:1px solid #000">
+Moodle File Picker
+</object>
 </noscript>
 EOD;
         $str .= $PAGE->requires->js_function_call('destroy_item', array("nonjs-filepicker-{$client_id}"))->asap();
         $str .= $PAGE->requires->js_function_call('show_item', array("filepicker-wrapper-{$client_id}"))->asap();
+        $PAGE->requires->js_function_call('fp_init_filepicker', array('filepicker-button-'.$client_id, $options))->on_dom_ready();
         return $str;
     }
 
diff --git a/lib/javascript-static.js b/lib/javascript-static.js
index 07d57a45b45..71208e96663 100644
--- a/lib/javascript-static.js
+++ b/lib/javascript-static.js
@@ -1,5 +1,6 @@
 // Miscellaneous core Javascript functions for Moodle
-
+// Global instance of YUI3
+var Y = null;
 function popupchecker(msg) {
     var testwindow = window.open('', '', 'width=1,height=1,left=0,top=0,scrollbars=no');
     if (!testwindow) {
@@ -2051,4 +2052,4 @@ blocks.dock.item.prototype.show =               blocks.dock.abstract_item_class.
 blocks.dock.item.prototype.hide =               blocks.dock.abstract_item_class.hide;
 blocks.dock.item.prototype.resize_panel =       blocks.dock.abstract_item_class.resize_panel;
 
-///////////////// END OF BLOCKS CODE \\\\\\\\\\\\\\\\\\\\\\
\ No newline at end of file
+///////////////// END OF BLOCKS CODE \\\\\\\\\\\\\\\\\\\\\\
diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php
index 8f4b00ef343..b4df5caef4e 100755
--- a/repository/boxnet/repository.class.php
+++ b/repository/boxnet/repository.class.php
@@ -173,7 +173,7 @@ class repository_boxnet extends repository {
                             'date'=>$filedates[$n],
                             'source'=>'http://box.net/api/1.0/download/'
                                 .$this->auth_token.'/'.$fileids[$n],
-                            'thumbnail' => $OUTPUT->pix_url(file_extension_icon($v, 32)));
+                            'thumbnail' => $OUTPUT->pix_url(file_extension_icon($v, 32))->out());
                 }
             }
         }
diff --git a/repository/filepicker.js b/repository/filepicker.js
new file mode 100644
index 00000000000..a67cc2bff23
--- /dev/null
+++ b/repository/filepicker.js
@@ -0,0 +1,1086 @@
+// YUI3 File Picker module for moodle
+// Author: Dongsheng Cai <dongsheng@moodle.com>
+
+/**
+ *
+ * File Picker UI
+ * =====
+ * this.loaded, it tracks if yui2 and yui3 js files loaded
+ * this.rendered, it tracks if YUI Panel rendered
+ * this.auto_render, tell launch() to render filepicker when all js files are loaded
+ * this.api, stores the URL to make ajax request
+ * this.loader, yui2 loader
+ * this.mainui, YUI Panel
+ * this.treeview, YUI Treeview
+ * this.viewbar, a button group to switch view mode
+ * this.viewmode, store current view mode
+ *
+ * Filepicker options:
+ * =====
+ * this.options.pix, stores all images used in file picker
+ * this.options.client_id, the instance id
+ * this.options.contextid
+ * this.options.itemid
+ * this.options.repositories, stores all repositories displaied in file picker
+ * this.options.formcallback
+ *
+ * Active repository options
+ * =====
+ * this.active_repo.id
+ * this.active_repo.nosearch
+ * this.active_repo.norefresh
+ * this.active_repo.nologin
+ * this.active_repo.help
+ * this.active_repo.manage
+ * 
+ * Server responses
+ * =====
+ * this.filelist, cached filelist
+ * this.pages
+ * this.page
+ * this.filepath, current path
+ * this.logindata, cached login form
+ */
+
+var active_filepicker = null;
+
+YUI.add('filepicker', function(Y) {
+    function filepicker (args) {
+        filepicker.superclass.constructor.apply(this, arguments);
+    }
+    filepicker.NAME = "FilePicker";
+    filepicker.ATTRS = {
+        options: {},
+        lang: {}
+    };
+    filepicker.json_decode = function(string, source) {
+        var obj = null;
+        try {
+            obj = Y.JSON.parse(string);
+        } catch(e) {
+            alert(mstr.repository.invalidjson+' - |'+source+'| -'+stripHTML(string));
+        }
+        return obj;
+    }
+    Y.extend(filepicker, Y.Base, {
+        api: moodle_cfg.wwwroot+'/repository/repository_ajax.php',
+        initializer: function(args) {
+            this.options = args;
+            var loader_scope = this;
+            this.loaded = false;
+            // load yui2 components
+            this.loader = new YAHOO.util.YUILoader({
+                base: moodle_cfg.yui2loaderBase,
+                combine: false,
+                comboBase: moodle_cfg.yui2loaderComboBase,
+                require: ["button", "container", "treeview", "layout"],
+                loadOptional: true,
+                onSuccess: function(o) {
+                    loader_scope.loaded = true;
+                    if (loader_scope.auto_render) {
+                        loader_scope.render();
+                    }
+                },
+                onProgress: function(o) {
+                }
+            });
+            this.loader.insert();
+        },
+        destructor: function() {
+        },
+        request: function(args, redraw) {
+            var api = this.api + '?action='+args.action;
+            var params = {};
+            var scope = this;
+            if (args['scope']) {
+                scope = args['scope'];
+            }
+            params['repo_id']=args.repository_id;
+            params['p'] = args.path?args.path:'';
+            params['page'] = args.page?args.page:'';
+            params['env']=this.options.env;
+            // the form element only accept certain file types
+            params['accepted_types']=this.options.accepted_types;
+            params['sesskey']=moodle_cfg.sesskey;
+            params['client_id'] = args.client_id;
+            params['itemid'] = this.itemid?this.itemid:0;
+            if (args['params']) {
+                for (i in args['params']) {
+                    params[i] = args['params'][i];
+                }
+            }
+            var cfg = {
+                method: 'POST',
+                on: {
+                    complete: function(id,o,p) {
+                        if (!o) {
+                            alert('IO FATAL');
+                            return;
+                        }
+                        var data = filepicker.json_decode(o.responseText);
+                        args.callback(id,data,p);
+                    }
+                },
+                arguments: {
+                    scope: scope
+                },
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+                    'User-Agent': 'MoodleFilePicker/3.0'
+                },
+                data: build_querystring(params)
+            };
+            if (args.form) {
+                cfg.form = args.form;
+            }
+            Y.io(api, cfg);
+            if (redraw) {
+                this.wait('load');
+            }
+        },
+        build_tree: function(node, level) {
+            var client_id = this.options.client_id;
+            if(node.children) {
+                node.title = '<i><u>'+node.title+'</u></i>';
+            }
+            var info = {
+                label:node.title,
+                //title:fp_lang.date+' '+node.date+fp_lang.size+' '+node.size,
+                filename:node.title,
+                source:node.source?node.source:'',
+                thumbnail:node.thumbnail,
+                path:node.path?node.path:[]
+            };
+            var tmpNode = new YAHOO.widget.TextNode(info, level, false);
+            //var tooltip = new YAHOO.widget.Tooltip(tmpNode.labelElId, {
+                //context:tmpNode.labelElId, text:info.title});
+            if(node.repo_id) {
+                tmpNode.repo_id=node.repo_id;
+            }else{
+                tmpNode.repo_id=this.active_repo.id;
+            }
+            if(node.children) {
+                if(node.expanded) {
+                    tmpNode.expand();
+                }
+                tmpNode.isLeaf = false;
+                tmpNode.client_id = client_id;
+                if (node.path) {
+                    tmpNode.path = node.path;
+                } else {
+                    tmpNode.path = '';
+                }
+                for(var c in node.children) {
+                    this.build_tree(node.children[c], tmpNode);
+                }
+            } else {
+                tmpNode.isLeaf = true;
+            }
+        },
+        view_files: function() {
+            this.viewbar.set('disabled', false);
+            if (this.viewmode == 1) {
+                this.view_as_icons();
+            } else if (this.viewmode ==2) {
+                this.view_as_list();
+            } else {
+                this.view_as_icons();
+            }
+        },
+        view_as_list: function() {
+            var client_id = this.options.client_id;
+            var list = this.filelist;
+            var panel_id = '#panel-'+client_id;
+            this.viewmode = 2;
+            Y.one(panel_id).set('innerHTML', '');
+
+            this.print_header();
+            var tree = Y.Node.create('<div id="treeview-'+client_id+'"></div>');
+            Y.one(panel_id).appendChild(tree);
+            this.treeview = new YAHOO.widget.TreeView('treeview-'+client_id);
+
+            for(k in list) {
+                this.build_tree(list[k], this.treeview.getRoot());
+            }
+            var scope = this;
+            this.treeview.subscribe('clickEvent', function(e){
+                if(e.node.isLeaf){
+                    var fileinfo = {};
+                    fileinfo['title'] = e.node.data.filename;
+                    fileinfo['source'] = e.node.data.source;
+                    fileinfo['thumbnail'] = e.node.data.thumbnail;
+                    scope.select_file(fileinfo);
+                }
+            });
+            this.treeview.draw();
+        },
+        view_as_icons: function() {
+            var client_id = this.options.client_id;
+            var list = this.filelist;
+            var panel_id = '#panel-'+client_id;
+            this.viewmode = 1;
+            Y.one(panel_id).set('innerHTML', '');
+
+            this.print_header();
+
+            var gridpanel = Y.Node.create('<div id="fp-grid-panel-'+client_id+'"></div>');
+            Y.one('#panel-'+client_id).appendChild(gridpanel);
+            var count = 0;
+            for(var k in list) {
+                var node = list[k];
+                var grid = document.createElement('DIV');
+                grid.className='fp-grid';
+                // the file name
+                var title = document.createElement('DIV');
+                title.id = 'grid-title-'+client_id+'-'+String(count);
+                title.className = 'label';
+                if (node.shorttitle) {
+                    node.title = node.shorttitle;
+                }
+                title.innerHTML += '<a href="###"><span>'+node.title+"</span></a>";
+
+                if(node.thumbnail_width){
+                    grid.style.width = node.thumbnail_width+'px';
+                    title.style.width = (node.thumbnail_width-10)+'px';
+                } else {
+                    grid.style.width = title.style.width = '90px';
+                }
+                var frame = document.createElement('DIV');
+                frame.style.textAlign='center';
+                if(node.thumbnail_height){
+                    frame.style.height = node.thumbnail_height+'px';
+                }
+                var img = document.createElement('img');
+                img.src = node.thumbnail;
+                if(node.thumbnail_alt) {
+                    img.alt = node.thumbnail_alt;
+                }
+                if(node.thumbnail_title) {
+                    img.title = node.thumbnail_title;
+                }
+
+                var link = document.createElement('A');
+                link.href='###';
+                link.id = 'img-id-'+client_id+'-'+String(count);
+                if(node.url) {
+                    // hide 
+                    //grid.innerHTML += '<p><a target="_blank" href="'+node.url+'">'+mstr.repository.preview+'</a></p>';
+                }
+                link.appendChild(img);
+                frame.appendChild(link);
+                grid.appendChild(frame);
+                grid.appendChild(title);
+                gridpanel.appendChild(grid);
+
+                var y_title = Y.one('#'+title.id);
+                var y_file = Y.one('#'+link.id);
+                if(node.children) {
+                    y_file.on('click', function(e, p) {
+                        if(p.dynload) {
+                            var params = {};
+                        }else{
+                            this.filelist = p.children;
+                            this.view_files();
+                        }
+                    }, this, node);
+                    y_title.on('click', function(e, p){
+                        //Y.Event.simulate(y_file, 'click');
+                    }, this, node);
+                } else {
+                    var fileinfo = {};
+                    fileinfo['title'] = list[k].title;
+                    fileinfo['source'] = list[k].source;
+                    fileinfo['thumbnail'] = list[k].thumbnail;
+                    y_title.on('click', function(e, args) {
+                        this.select_file(args);
+                    }, this, fileinfo);
+                    y_file.on('click', function(e, args) {
+                        this.select_file(args);
+                    }, this, fileinfo);
+                }
+                count++;
+            }
+            //if (list.length == 0 && !this.upload) {
+                //panel.innerHTML = '<div class="fp-error">'+mstr.repository.emptylist+'</div>';
+            //}
+            //container.appendChild(panel);
+            //repository_client.print_footer(client_id);
+        },
+        select_file: function(args) {
+            var client_id = this.options.client_id;
+            var thumbnail = Y.one('#fp-grid-panel-'+client_id);
+            if(thumbnail){
+                thumbnail.setStyle('display', 'none');
+            }
+            var header = Y.one('#fp-header-'+client_id);
+            if (header) {
+                header.setStyle('display', 'none');
+            }
+            var footer = Y.one('#fp-footer-'+client_id);
+            if (footer) {
+                footer.setStyle('display', 'none');
+            }
+            var path = Y.one('#path-'+client_id);
+            if(path){
+                path.setStyle('display', 'none');
+            }
+            var panel = Y.one('#panel-'+client_id);
+            var html = '<div class="fp-rename-form">';
+            html += '<p><img src="'+args.thumbnail+'" /></p>';
+            html += '<p><label for="newname-'+client_id+'">'+mstr.repository.saveas+'</label>';
+            html += '<input type="text" id="newname-'+client_id+'" value="'+args.title+'" /></p>';
+
+            var le_checked = '';
+            var le_style = '';
+            if (this.options.repositories[this.active_repo.id].return_types == 1) {
+                // support external links only
+                le_checked = 'checked';
+                le_style = ' style="display:none;"';
+            } else if(this.options.repositories[this.active_repo.id].return_types == 2) {
+                // support internal files only
+                le_style = ' style="display:none;"';
+            }
+            if (this.options.externallink && this.options.env == 'editor') {
+                html += '<p'+le_style+'><input type="checkbox" id="linkexternal-'+client_id+'" value="" '+le_checked+' />'+mstr.repository.linkexternal+'</p>';
+            }
+            html += '<p><input type="hidden" id="filesource-'+client_id+'" value="'+args.source+'" />';
+            html += '<input type="button" id="fp-confirm-'+client_id+'" value="'+mstr.repository.getfile+'" />';
+            html += '<input type="button" id="fp-cancel-'+client_id+'" value="'+mstr.moodle.cancel+'" /></p>';
+            html += '</div>';
+
+            var getfile_form = Y.Node.create(html);
+            panel.appendChild(getfile_form);
+
+            var getfile = Y.one('#fp-confirm-'+client_id);
+            getfile.on('click', function(e) {
+                var client_id = this.options.client_id;
+                var scope = this;
+                var repository_id = this.active_repo.id;
+                var title = Y.one('#newname-'+client_id).get('value');
+                var filesource = Y.one('#filesource-'+client_id).get('value');
+                var params = {'title':title, 'file':filesource};
+
+                if (this.options.env == 'editor') {
+                    var linkexternal = Y.one('#linkexternal-'+client_id).get('checked');
+                    if (linkexternal) {
+                        params['linkexternal'] = 'yes';
+                    }
+                } if (this.options.env == 'url') {
+                    params['linkexternal'] = 'yes';
+                }
+
+                this.wait('download', title);
+                this.request({
+                        action:'download',
+                        client_id: client_id,
+                        repository_id: repository_id,
+                        'params': params,
+                        callback: function(id, obj, args) {
+                            if (scope.options.editor_target&&scope.options.env=='editor') {
+                                scope.options.editor_target.value=obj.url;
+                                scope.options.editor_target.onchange();
+                            }
+                            scope.hide();
+                            scope.options.formcallback(obj);
+                        }
+                }, true);
+            }, this);
+            var cancel = Y.one('#fp-cancel-'+client_id);
+            cancel.on('click', function(e) {
+                this.view_files();
+            }, this);
+            var treeview = Y.one('#treeview-'+client_id);
+            if (treeview){
+                treeview.setStyle('display', 'none');
+            }
+        },
+        wait: function(type) {
+            var panel = Y.one('#panel-'+this.options.client_id);
+            panel.set('innerHTML', '');
+            var name = '';
+            var str = '<div style="text-align:center">';
+            if(type=='load') {
+                str += '<img src="'+this.options.pix.loading+'" />';
+                str += '<p>'+mstr.repository.loading+'</p>';
+            }else{
+                str += '<img src="'+this.options.pix.progressbar+'" />';
+                str += '<p>'+mstr.repository.copying+' <strong>'+name+'</strong></p>';
+            }
+            str += '</div>';
+            try {
+                panel.set('innerHTML', str);
+            } catch(e) {
+                alert(e.toString());
+            }
+        },
+        render: function() {
+            var client_id = this.options.client_id;
+            var filepicker_id = 'filepicker-'+client_id;
+            var fpnode = Y.Node.create('<div class="file-picker" id="'+filepicker_id+'"></div>');
+            Y.one(document.body).appendChild(fpnode);
+            // render file picker panel
+            this.mainui = new YAHOO.widget.Panel(filepicker_id, {
+                draggable: true,
+                close: true,
+                underlay: 'none',
+                zindex: 9999999,
+                monitorresize: false,
+                xy: [50, YAHOO.util.Dom.getDocumentScrollTop()+20]
+            });
+            var layout = null;
+            this.mainui.beforeRenderEvent.subscribe(function() {
+                YAHOO.util.Event.onAvailable('layout-'+client_id, function() {
+                    layout = new YAHOO.widget.Layout('layout-'+client_id, {
+                        height: 480, width: 700,
+                        units: [
+                        {position: 'top', height: 32, resize: false,
+                        body:'<div class="yui-buttongroup fp-viewbar" id="fp-viewbar-'+client_id+'"></div><div class="fp-searchbar" id="search-div-'+client_id+'"></div>', gutter: '2'},
+                        {position: 'left', width: 200, resize: true, scroll:true,
+                        body:'<ul class="fp-list" id="fp-list-'+client_id+'"></ul>', gutter: '0 5 0 2', minWidth: 150, maxWidth: 300 },
+                        {position: 'center', body: '<div class="fp-panel" id="panel-'+client_id+'"></div>',
+                        scroll: true, gutter: '0 2 0 0' }
+                        ]
+                    });
+                    layout.render();
+                });
+            });
+            this.mainui.setHeader('File Picker');
+            this.mainui.setBody('<div id="layout-'+client_id+'"></div>');
+            this.mainui.render();
+            this.rendered = true;
+
+            var scope = this;
+            // adding buttons
+            var view_icons = {label: mstr.repository.iconview, value: 't',
+                onclick: {
+                    fn: function(){
+                        scope.view_as_icons();
+                    }
+                }
+            };
+            var view_listing = {label: mstr.repository.listview, value: 'l',
+                onclick: {
+                    fn: function(){
+                        scope.view_as_list();
+                    }
+                }
+            };
+            this.viewbar = new YAHOO.widget.ButtonGroup({
+                id: 'btngroup-'+client_id,
+                name: 'buttons',
+                disabled: true,
+                container: 'fp-viewbar-'+client_id
+            });
+            this.viewbar.addButtons([view_icons, view_listing]);
+            // processing repository listing
+            var r = this.options.repositories;
+            Y.on('contentready', function(el) {
+                var list = Y.one(el);
+                var count = 0;
+                for (var i in r) {
+                    var id = 'repository-'+client_id+'-'+count;
+                    var link_id = id + '-link';
+                    list.append('<li id="'+id+'"><a class="fp-repo-name" id="'+link_id+'" href="###">'+r[i].name+'</a></li>');
+                    Y.one('#'+link_id).prepend('<img src="'+r[i].icon+'" width="16" height="16" />&nbsp;');
+                    Y.one('#'+link_id).on('click', function(e, scope, repository_id) {
+                        scope.repository_id = repository_id;
+                        Y.all(el+' li a').setStyle('backgroundColor', 'transparent');
+                        e.currentTarget.setStyle('backgroundColor', '#CCC');
+                        this.list({'repo_id':repository_id});
+                    }, this /*handler running scope*/, this/*second argument*/, r[i].id/*third argument of handler*/);
+                    count++;
+                }
+            }, '#fp-list-'+client_id, this /* handler running scope */, '#fp-list-'+client_id /*first argument of handler*/);
+        },
+        parse_repository_options: function(data) {
+            this.filelist = data.list?data.list:null;
+            this.filepath = data.path?data.path:null;
+            this.active_repo = {};
+            this.active_repo.issearchresult = Boolean(data.issearchresult);
+            this.active_repo.pages = Number(data.pages?data.pages:null);
+            this.active_repo.page = Number(data.page?data.page:null);
+            this.active_repo.id = data.repo_id?data.repo_id:null;
+            this.active_repo.nosearch = data.nosearch?true:false;
+            this.active_repo.norefresh = data.norefresh?true:false;
+            this.active_repo.nologin = data.nologin?true:false;
+            this.active_repo.help = data.help?data.help:null;
+            this.active_repo.manage = data.manage?data.manage:null;
+        },
+        print_login: function(data) {
+            var client_id = this.options.client_id;
+            var repository_id = data.repo_id;
+            var l = this.logindata = data.login;
+            var loginurl = '';
+            var panel = Y.one('#panel-'+client_id);
+            var action = 'login';
+            if (data['login_btn_action']) {
+                action=data['login_btn_action'];
+            }
+            var form_id = 'fp-form-'+client_id;
+            var download_button_id = 'fp-form-download-button-'+client_id;
+            var search_button_id   = 'fp-form-search-button-'+client_id;
+            var login_button_id    = 'fp-form-login-button-'+client_id;
+            var popup_button_id    = 'fp-form-popup-button-'+client_id;
+
+            var str = '<div class="fp-login-form">';
+            str += '<form id="'+form_id+'">';
+            var has_pop = false;
+            str +='<table width="100%">';
+            for(var k in l) {
+                str +='<tr>';
+                if(l[k].type=='popup') {
+                    // pop element
+                    loginurl = l[k].url;
+                    str += '<td colspan="2"><p class="fp-popup">'+mstr.repository.popup+'</p>';
+                    str += '<p class="fp-popup"><button id="'+popup_button_id+'">'+mstr.repository.login+'</button>';
+                    str += '</p></td>';
+                    action = 'popup';
+                }else if(l[k].type=='textarea') {
+                    // textarea element
+                    str += '<td colspan="2"><p><textarea id="'+l[k].id+'" name="'+l[k].name+'"></textarea></p></td>';
+                }else if(l[k].type=='select') {
+                    // select element
+                    str += '<td align="right"><label>'+l[k].label+':</label></td>';
+                    str += '<td align="left"><select id="'+l[k].id+'" name="'+l[k].name+'">';
+                    for (i in l[k].options) {
+                        str += '<option value="'+l[k].options[i].value+'">'+l[k].options[i].label+'</option>';
+                    }
+                    str += '</select></td>';
+                }else{
+                    // input element
+                    var label_id = '';
+                    var field_id = '';
+                    var field_value = '';
+                    if(l[k].id) {
+                        label_id = ' for="'+l[k].id+'"';
+                        field_id = ' id="'+l[k].id+'"';
+                    }
+                    if (l[k].label) {
+                        str += '<td align="right" width="30%" valign="center">';
+                        str += '<label'+label_id+'>'+l[k].label+'</label> </td>';
+                    } else {
+                        str += '<td width="30%"></td>';
+                    }
+                    if(l[k].value) {
+                        field_value = ' value="'+l[k].value+'"';
+                    }
+                    if(l[k].type=='radio'){
+                        var list = l[k].value.split('|');
+                        var labels = l[k].value_label.split('|');
+                        str += '<td align="left">';
+                        for(var item in list) {
+                            str +='<input type="'+l[k].type+'"'+' name="'+l[k].name+'"'+
+                                field_id+' value="'+list[item]+'" />'+labels[item]+'<br />';
+                        }
+                        str += '</td>';
+                    }else{
+                        str += '<td align="left">';
+                        str += '<input type="'+l[k].type+'"'+' name="'+l[k].name+'"'+field_value+' '+field_id+' />';
+                        str += '</td>';
+                    }
+                }
+                str +='</tr>';
+            }
+            str +='</table>';
+            str += '</form>';
+
+            // custom lable text
+            var btn_label = data['login_btn_label']?data['login_btn_label']:mstr.repository.submit;
+            if (action != 'popup') {
+                str += '<p><input type="button" id="';
+                switch (action) {
+                    case 'search':
+                        str += search_button_id;
+                        break;
+                    case 'download':
+                        str += download_button_id;
+                        break;
+                    default:
+                        str += login_button_id;
+                        break;
+                }
+                str += '" value="'+btn_label+'" /></p>';
+            }
+
+            str += '</div>';
+
+            // insert login form
+            try {
+                panel.set('innerHTML', str);
+            } catch(e) {
+                alert(e.toString()+mstr.quiz.xhtml);
+            }
+            // register buttons
+            // process login action
+            var login_button = Y.one('#'+login_button_id);
+            var scope = this;
+            if (login_button) {
+                login_button.on('click', function(){
+                    // collect form data
+                    var data = this.logindata;
+                    var scope = this;
+                    var params = {};
+                    for (var k in data) {
+                        if(data[k].type!='popup') {
+                            var el = Y.one('[name='+data[k].name+']');
+                            var type = el.get('type');
+                            params[data[k].name] = '';
+                            if(type == 'checkbox') {
+                                params[data[k].name] = el.get('checked');
+                            } else {
+                                params[data[k].name] = el.get('value');
+                            }
+                        }
+                    }
+                    // start ajax request
+                    this.request({
+                        'params': params,
+                        'scope': scope,
+                        'action':'signin',
+                        'path': '',
+                        'client_id': client_id,
+                        'repository_id': repository_id,
+                        'callback': function(id, o, args) {
+                            scope.parse_repository_options(o);
+                            scope.view_files();
+                            if (o.msg) {
+                                // do something
+                            }
+                        }
+                    }, true);
+                }, this);
+            }
+            var search_button = Y.one('#'+search_button_id);
+            if (search_button) {
+                search_button.on('click', function(){
+                    var data = this.logindata;
+                    var params = {};
+
+                    for (var k in data) {
+                        if(data[k].type!='popup') {
+                            var el = document.getElementsByName(data[k].name)[0];
+                            params[data[k].name] = '';
+                            if(el.type == 'checkbox') {
+                                params[data[k].name] = el.checked;
+                            } else if(el.type == 'radio') {
+                                var tmp = document.getElementsByName(data[k].name);
+                                for(var i in tmp) {
+                                    if (tmp[i].checked) {
+                                        params[data[k].name] = tmp[i].value;
+                                    }
+                                }
+                            } else {
+                                params[data[k].name] = el.value;
+                            }
+                        }
+                    }
+                    this.request({
+                            scope: scope,
+                            action:'search',
+                            client_id: client_id,
+                            repository_id: repository_id,
+                            form: {id: 'fp-form-'+scope.options.client_id,upload:false,useDisabled:true},
+                            callback: function(id, o, args) {
+                                o.issearchresult = true;
+                                scope.parse_repository_options(o);
+                                scope.view_files();
+                            }
+                    }, true);
+                }, this);
+            }
+            var download_button = Y.one('#'+download_button_id);
+            if (download_button) {
+                download_button.on('click', function(){
+                    alert('download');
+                });
+            }
+            var popup_button = Y.one('#'+popup_button_id);
+            if (popup_button) {
+                popup_button.on('click', function(){
+                    window.open(loginurl, 'repo_auth', 'location=0,status=0,scrollbars=0,width=500,height=300');
+                    active_filepicker = this;
+                }, this);
+            }
+
+        },
+        search: function(args) {
+            var data = this.logindata;
+            var params = {};
+
+            for (var k in data) {
+                if(data[k].type!='popup') {
+                    var el = document.getElementsByName(data[k].name)[0];
+                    params[data[k].name] = '';
+                    if(el.type == 'checkbox') {
+                        params[data[k].name] = el.checked;
+                    } else if(el.type == 'radio') {
+                        var tmp = document.getElementsByName(data[k].name);
+                        for(var i in tmp) {
+                            if (tmp[i].checked) {
+                                params[data[k].name] = tmp[i].value;
+                            }
+                        }
+                    } else {
+                        params[data[k].name] = el.value;
+                    }
+                }
+            }
+            this.request({
+                    scope: scope,
+                    action:'search',
+                    client_id: client_id,
+                    repository_id: repository_id,
+                    form: {id: 'fp-form-'+scope.options.client_id,upload:false,useDisabled:true},
+                    callback: function(id, o, args) {
+                        o.issearchresult = true;
+                        scope.parse_repository_options(o);
+                        scope.view_files();
+                    }
+            }, true);
+        },
+        list: function(args) {
+            var scope = this;
+            if (!args) {
+                args = {};
+            }
+            if (!args.repo_id) {
+                args.repo_id = scope.active_repo.id;
+            }
+            scope.request({
+                action:'list',
+                client_id: scope.options.client_id,
+                repository_id: args.repo_id,
+                path:args.path?args.path:'',
+                page:args.page?args.page:'',
+                callback: function(id, obj, args) {
+                    if (obj.login) {
+                        scope.viewbar.set('disabled', true);
+                        scope.print_login(obj);
+                    } else if (obj.upload) {
+                        scope.viewbar.set('disabled', true);
+                        scope.parse_repository_options(obj);
+                        scope.create_upload_form(obj);
+                    
+                    } else if (obj.iframe) {
+
+                    } else if (obj.list) {
+                        obj.issearchresult = false;
+                        scope.viewbar.set('disabled', false);
+                        scope.parse_repository_options(obj);
+                        scope.view_files();
+                    }
+                    if (obj.msg) {
+                        // TODO: Print message
+                    }
+                }
+            }, true);
+        },
+        create_upload_form: function(data) {
+            var client_id = this.options.client_id;
+            Y.one('#panel-'+client_id).set('innerHTML', '');
+
+            this.print_header();
+            var id = data.upload.id+'_'+client_id;
+            var str = '<div id="'+id+'_div" class="fp-upload-form">';
+            str += '<form id="'+id+'" onsubmit="return false">';
+            str += '<label for="'+id+'_file">'+data.upload.label+': </label>';
+            str += '<input type="file" id="'+id+'_file" name="repo_upload_file" />';
+            str += '<div class="fp-upload-btn"><a id="'+id+'_action" href="###" >'+mstr.repository.upload+'</a></div>';
+            str += '</form>';
+            str += '</div>';
+            var upload_form = Y.Node.create(str);
+            Y.one('#panel-'+client_id).appendChild(upload_form);
+            var scope = this;
+            Y.one('#'+id+'_action').on('click', function() {
+                alert('FAIL');
+                //this.request({
+                        //scope: scope,
+                        //action:'upload',
+                        //client_id: client_id,
+                        //repository_id: scope.options.active_repo.id,
+                        //form: {id: 'fp-search-form',upload:true,useDisabled:true},
+                        //callback: function(id, o, args) {
+                        //}
+                //}, true);
+            }, this);
+        },
+        print_header: function() {
+            var r = this.active_repo;
+            var scope = this;
+            var client_id = this.options.client_id;
+            var repository_id = this.active_repo.id;
+            var panel = Y.one('#panel-'+client_id);
+            var str = '<div id="fp-header-'+client_id+'">';
+            str += '<div class="fp-toolbar" id="repo-tb-'+client_id+'"></div>';
+            str += '</div>';
+            var head = Y.Node.create(str);
+            panel.appendChild(head);
+            //if(this.active_repo.pages < 8){
+                this.print_paging('header');
+            //}
+
+
+            var toolbar = Y.one('#repo-tb-'+client_id);
+
+            if(!r.nosearch) {
+                var html = '<a href="###"><img src="'+this.options.pix.search+'" /> '+mstr.repository.search+'</a>';
+                var search = Y.Node.create(html);
+                search.on('click', function() {
+                    scope.request({
+                        scope: scope,
+                        action:'searchform',
+                        repository_id: repository_id,
+                        callback: function(id, obj, args) {
+                            var scope = args.scope;
+                            var client_id = scope.options.client_id;
+                            var repository_id = scope.active_repo.id;
+                            var container = document.getElementById('fp-search-dlg');
+                            if(container) {
+                                container.innerHTML = '';
+                                container.parentNode.removeChild(container);
+                            }
+                            var container = document.createElement('DIV');
+                            container.id = 'fp-search-dlg';
+
+                            var dlg_title = document.createElement('DIV');
+                            dlg_title.className = 'hd';
+                            dlg_title.innerHTML = 'filepicker';
+
+                            var dlg_body = document.createElement('DIV');
+                            dlg_body.className = 'bd';
+
+                            var sform = document.createElement('FORM');
+                            sform.method = 'POST';
+                            sform.id = "fp-search-form";
+                            sform.innerHTML = obj.form;
+
+                            dlg_body.appendChild(sform);
+                            container.appendChild(dlg_title);
+                            container.appendChild(dlg_body);
+                            Y.one(document.body).appendChild(container);
+                            var search_dialog= null;
+                            function dialog_handler() {
+                                scope.viewbar.set('disabled', false);
+                                scope.request({
+                                        scope: scope,
+                                        action:'search',
+                                        client_id: client_id,
+                                        repository_id: repository_id,
+                                        form: {id: 'fp-search-form',upload:false,useDisabled:true},
+                                        callback: function(id, o, args) {
+                                            scope.parse_repository_options(o);
+                                            scope.view_files();
+                                        }
+                                }, true);
+                                search_dialog.cancel();
+                            }
+
+                            var search_dialog = new YAHOO.widget.Dialog("fp-search-dlg", {
+                               postmethod: 'async',
+                               draggable: true,
+                               width : "30em",
+                               fixedcenter : true,
+                               zindex: 766667,
+                               visible : false,
+                               constraintoviewport : true,
+                               buttons: [
+                               {
+                                   text:mstr.repository.submit,
+                                   handler:dialog_handler,
+                                   isDefault:true
+                               }, {
+                                   text:mstr.moodle.cancel,
+                                   handler:function(){
+                                       this.destroy()
+                                   }
+                               }]
+                            });
+                            search_dialog.render();
+                            search_dialog.show();
+                        }
+                    });
+                },this);
+                toolbar.appendChild(search);
+            }
+            // weather we use cache for this instance, this button will reload listing anyway
+            if(!r.norefresh) {
+                var html = '<a href="###"><img src="'+this.options.pix.refresh+'" /> '+mstr.repository.refresh+'</a>';
+                var refresh = Y.Node.create(html);
+                refresh.on('click', function() {
+                    this.list();
+                }, this);
+                toolbar.appendChild(refresh);
+            }
+            if(!r.nologin) {
+                var html = '<a href="###"><img src="'+this.options.pix.logout+'" /> '+mstr.repository.logout+'</a>';
+                var logout = Y.Node.create(html);
+                logout.on('click', function() {
+                    this.request({
+                        action:'logout',
+                        client_id: client_id,
+                        repository_id: repository_id,
+                        path:'',
+                        callback: function(id, obj, args) {
+                            scope.viewbar.set('disabled', true);
+                            scope.print_login(obj);
+                        }
+                    }, true);
+                }, this);
+                toolbar.appendChild(logout);
+            }
+
+            if(r.manage) {
+                var mgr = document.createElement('A');
+                mgr.href = r.manage;
+                mgr.target = "_blank";
+                mgr.innerHTML = '<img src="'+this.options.pix.setting+'" /> '+mstr.repository.manageurl;
+                toolbar.appendChild(mgr);
+            }
+            if(r.help) {
+                var help = document.createElement('A');
+                help.href = r.help;
+                help.target = "_blank";
+                help.innerHTML = '<img src="'+this.options.pix.help+'" /> '+mstr.repository.help;
+                toolbar.appendChild(help);
+            }
+
+            // only show in icons view
+            if (this.viewmode == 1) {
+                this.print_path();
+            }
+        },
+        get_page_button: function(page) {
+            var r = this.active_repo;
+            var css = '';
+            if (page == r.page) {
+                css = 'class="cur_page" ';
+            }
+            var str = '<a '+css+'href="###" id="repo-page-'+page+'">';
+            return str;
+        },
+        print_paging: function(html_id) {
+            var client_id = this.options.client_id;
+            var scope = this;
+            var r = this.active_repo;
+            var str = '';
+            var action = '';
+            if(r.pages) {
+                str += '<div class="fp-paging" id="paging-'+html_id+'-'+client_id+'">';
+                str += this.get_page_button(1)+'1</a> ';
+
+                var span = 5;
+                var ex = (span-1)/2;
+
+                if (r.page+ex>=r.pages) {
+                    var max = r.pages;
+                } else {
+                    if (r.page<span) {
+                        var max = span;
+                    } else {
+                        var max = r.page+ex;
+                    }
+                }
+
+                // won't display upper boundary
+                if (r.page >= span) {
+                    str += ' ... ';
+                    for(var i=r.page-ex; i<max; i++) {
+                        str += this.get_page_button(i);
+                        str += String(i);
+                        str += '</a> ';
+                    }
+                } else {
+                    // this very first elements
+                    for(var i = 2; i < max; i++) {
+                        str += this.get_page_button(i);
+                        str += String(i);
+                        str += '</a> ';
+                    }
+                }
+
+                // won't display upper boundary
+                if (max==r.pages) {
+                    str += this.get_page_button(r.pages)+r.pages+'</a>';
+                } else {
+                    str += this.get_page_button(max)+max+'</a>';
+                    str += ' ... '+this.get_page_button(r.pages)+r.pages+'</a>';
+                }
+                str += '</div>';
+            }
+            if (str) {
+                var a = Y.Node.create(str);
+                Y.one('#fp-header-'+client_id).appendChild(a);
+
+                Y.all('#fp-header-'+client_id+' .fp-paging a').each(
+                    function(node, id) {
+                        node.on('click', function(e) {
+                            var id = node.get('id');
+                            var re = new RegExp("repo-page-(\\d+)", "i");
+                            var result = id.match(re);
+                            var args = {};
+                            args.page = result[1];
+                            if (scope.active_repo.issearchresult) {
+                                scope.request({
+                                        scope: scope,
+                                        action:'search',
+                                        client_id: client_id,
+                                        repository_id: r.id,
+                                        params: {'page':result[1]},
+                                        callback: function(id, o, args) {
+                                            o.issearchresult = true;
+                                            scope.parse_repository_options(o);
+                                            scope.view_files();
+                                        }
+                                }, true);
+
+                            } else {
+                                scope.list(args);
+                            }
+                        });
+                    });
+            }
+        },
+        print_path: function() {
+            var client_id = this.options.client_id;
+            if (this.viewmode == 2) {
+                return;
+            }
+            var panel = Y.one('#panel-'+client_id);
+            var p = this.filepath;
+            if(p && p.length!=0) {
+                var path = Y.Node.create('<div id="path-'+client_id+'" class="fp-pathbar"></div>');
+                panel.appendChild(path);
+                for(var i = 0; i < p.length; i++) {
+                    var link = document.createElement('A');
+                    link.href = "###";
+                    link.innerHTML = p[i].name;
+                    //link.id = 'path-'+client_id+'-'+repo_id;
+                    var sep = Y.Node.create('<span>/</span>');
+                    
+                    path.appendChild(link);
+                    path.appendChild(sep);
+                }
+            }
+        },
+        hide: function() {
+            this.mainui.hide();
+        },
+        show: function() {
+            if (this.rendered) {
+                var panel = Y.one('#panel-'+this.options.client_id);
+                panel.set('innerHTML', '');
+                this.mainui.show();
+            } else {
+                this.launch();
+            }
+        },
+        launch: function() {
+            if (this.loaded) {
+                this.render();
+            } else {
+                this.auto_render = true;
+            }
+        }
+    });
+    Y.filepicker = filepicker;
+}, '3.0.0', {requires:['base', 'node', 'json', 'async-queue', 'io']});
diff --git a/repository/flickr_public/repository.class.php b/repository/flickr_public/repository.class.php
index ae169359141..adca39d8c04 100644
--- a/repository/flickr_public/repository.class.php
+++ b/repository/flickr_public/repository.class.php
@@ -15,6 +15,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+
+require_once($CFG->libdir.'/flickrlib.php');
+require_once(dirname(__FILE__) . '/image.php');
+
 /**
  * repository_flickr_public class
  * This one is used to create public repository
@@ -28,13 +32,6 @@
  * @author Dongsheng Cai <dongsheng@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-
-require_once($CFG->libdir.'/flickrlib.php');
-require_once(dirname(__FILE__) . '/image.php');
-
-/**
- *
- */
 class repository_flickr_public extends repository {
     private $flickr;
     public $photos;
@@ -49,12 +46,12 @@ class repository_flickr_public extends repository {
             set_config('api_key', trim($options['api_key']), 'flickr_public');
         }
         unset($options['api_key']);
-        $ret = parent::set_option($options);
-        return $ret;
+        return parent::set_option($options);
     }
 
     /**
      * get api_key from config table
+     *
      * @param string $config
      * @return mixed
      */
@@ -64,12 +61,12 @@ class repository_flickr_public extends repository {
         } else {
             $options['api_key'] = trim(get_config('flickr_public', 'api_key'));
         }
-        $options = parent::get_option($config);
-        return $options;
+        return parent::get_option($config);
     }
 
     /**
      * is global_search available?
+     *
      * @return boolean
      */
     public function global_search() {
@@ -81,8 +78,10 @@ class repository_flickr_public extends repository {
     }
 
     /**
+     * constructor method
      *
      * @global object $CFG
+     * @global object $SESSION
      * @param int $repositoryid
      * @param int $context
      * @param array $options
@@ -123,6 +122,7 @@ class repository_flickr_public extends repository {
     }
 
     /**
+     * construct login form
      *
      * @param boolean $ajax
      * @return array
@@ -193,8 +193,9 @@ class repository_flickr_public extends repository {
     }
 
     /**
+     * destroy session
      *
-     * @return <type>
+     * @return object
      */
     public function logout() {
         global $SESSION;
@@ -205,13 +206,18 @@ class repository_flickr_public extends repository {
     }
 
     /**
+     * search images on flickr
      *
-     * @param <type> $search_text
-     * @return <type>
+     * @param string $search_text
+     * @return array
      */
-    public function search($search_text) {
+    public function search($search_text, $page = 1) {
         global $SESSION;
         $ret = array();
+        if (empty($page)) {
+            $page = 1;
+        }
+
         if (!empty($this->flickr_account)) {
             $people = $this->flickr->people_findByEmail($this->flickr_account);
             $this->nsid = $people['nsid'];
@@ -228,12 +234,7 @@ class repository_flickr_public extends repository {
                 return $ret;
             }
         }
-        $is_paging = optional_param('search_paging', '', PARAM_RAW);
-        if (!empty($is_paging)) {
-            $page = optional_param('p', '', PARAM_INT);
-        } else {
-            $page = 1;
-        }
+
         // including all licenses by default
         $licenses = array(1=>1, 2, 3, 4, 5, 6, 7);
 
@@ -291,10 +292,11 @@ class repository_flickr_public extends repository {
     }
 
     /**
+     * return an image list
      *
      * @param string $path
      * @param int $page
-     * @return <type>
+     * @return array
      */
     public function get_listing($path = '', $page = 1) {
         $people = $this->flickr->people_findByEmail($this->flickr_account);
@@ -306,10 +308,11 @@ class repository_flickr_public extends repository {
     }
 
     /**
+     * build an image list
      *
-     * @param <type> $photos
-     * @param <type> $page
-     * @return <type>
+     * @param array $photos
+     * @param int $page
+     * @return array
      */
     private function build_list($photos, $page = 1, &$ret) {
         if (!empty($this->nsid)) {
@@ -414,7 +417,7 @@ class repository_flickr_public extends repository {
 
     /**
      * Add Instance settings input to Moodle form
-     * @param <type> $
+     * @param object $mform
      */
     public function instance_config_form(&$mform) {
         $mform->addElement('text', 'email_address', get_string('emailaddress', 'repository_flickr_public'));
@@ -423,7 +426,7 @@ class repository_flickr_public extends repository {
 
     /**
      * Names of the instance settings
-     * @return <type>
+     * @return array
      */
     public static function get_instance_option_names() {
         return array('email_address');
@@ -431,7 +434,7 @@ class repository_flickr_public extends repository {
 
     /**
      * Add Plugin settings input to Moodle form
-     * @param <type> $
+     * @param object $mform
      */
     public function type_config_form(&$mform) {
         $api_key = get_config('flickr_public', 'api_key');
@@ -451,7 +454,7 @@ class repository_flickr_public extends repository {
 
     /**
      * Names of the plugin settings
-     * @return <type>
+     * @return array 
      */
     public static function get_type_option_names() {
         return array('api_key', 'watermark');
diff --git a/repository/lib.php b/repository/lib.php
index cdc1c0cc4ea..5f649d3c292 100644
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -598,7 +598,6 @@ abstract class repository {
      * @param string $type a type name to retrieve
      * @return array repository instances
      */
-    //public static function get_instances($contexts=array(), $userid = null, $onlyvisible = true, $type=null, $accepted_types = '*', $returntypes = 3) {
     public static function get_instances($args = array()) {
         global $DB, $CFG, $USER;
 
@@ -616,7 +615,6 @@ abstract class repository {
 
         $onlyvisible = isset($args['onlyvisible']) ? $args['onlyvisible'] : true;
         $type        = isset($args['type']) ? $args['type'] : null;
-        $acceptedtypes = isset($args['accepted_types']) ? $args['accepted_types'] : '*';
         $returntypes   = isset($args['returntypes']) ? $args['returntypes'] : 3;
 
         $params = array();
@@ -657,7 +655,8 @@ abstract class repository {
         }
 
         $repositories = array();
-        $ft = new file_type_to_ext();
+        $ft = new filetype_parser();
+        $accepted_types = $args['accepted_types'];
         foreach ($records as $record) {
             if (!file_exists($CFG->dirroot . '/repository/'. $record->repositorytype.'/repository.class.php')) {
                 continue;
@@ -668,7 +667,6 @@ abstract class repository {
             $options['type']    = $record->repositorytype;
             $options['typeid']  = $record->typeid;
             // tell instance what file types will be accepted by file picker
-            $options['accepted_types'] = $ft->get_file_ext($acceptedtypes);
             $classname = 'repository_' . $record->repositorytype;
 
             $repository = new $classname($record->id, $record->contextid, $options, $record->readonly);
@@ -680,13 +678,13 @@ abstract class repository {
                 debugging('parent::__construct must be called by '.$record->repositorytype.' plugin.');
             } else {
                 // check mimetypes
-                if ($acceptedtypes !== '*' and $repository->supported_filetypes() !== '*') {
-                    $acceptedtypes = $ft->get_file_ext($acceptedtypes);
-                    $supported_filetypes = $ft->get_file_ext($repository->supported_filetypes());
+                if ($accepted_types !== '*' and $repository->supported_filetypes() !== '*') {
+                    $accepted_types = $ft->get_extensions($accepted_types);
+                    $supported_filetypes = $ft->get_extensions($repository->supported_filetypes());
 
                     $is_supported = false;
                     foreach  ($supported_filetypes as $type) {
-                        if (in_array($type, $acceptedtypes)) {
+                        if (in_array($type, $accepted_types)) {
                             $is_supported = true;
                         }
                     }
@@ -711,7 +709,7 @@ abstract class repository {
                         $capability = has_capability('repository/'.$record->repositorytype.':view', get_system_context());
                     }
                     if ($is_supported && $capability) {
-                        $repositories[] = $repository;
+                        $repositories[$repository->id] = $repository;
                     }
                 }
             }
@@ -794,13 +792,13 @@ abstract class repository {
      * @global object $DB
      * @global object $CFG
      * @global object $USER
-     * @param string $path file path in download folder
+     * @param string $filepath file path in download folder
      * @param string $name file name
      * @param integer $itemid item id to identify a file in filepool
      * @param string $filearea file area
      * @return array information of file in file pool
      */
-    public static function move_to_filepool($path, $name, $itemid, $filepath = '/', $filearea = 'user_draft') {
+    public static function move_to_filepool($thefile, $name, $itemid, $filepath = '/', $filearea = 'user_draft') {
         global $DB, $CFG, $USER, $OUTPUT;
         if ($filepath !== '/') {
             $filepath = trim($filepath, '/');
@@ -816,7 +814,7 @@ abstract class repository {
         $entry->timecreated  = $now;
         $entry->timemodified = $now;
         $entry->userid       = $USER->id;
-        $entry->mimetype     = mimeinfo('type', $path);
+        $entry->mimetype     = mimeinfo('type', $thefile);
         if(is_numeric($itemid)) {
             $entry->itemid = $itemid;
         } else {
@@ -827,18 +825,18 @@ abstract class repository {
         if ($existingfile = $fs->get_file($context->id, $filearea, $itemid, $filepath, $name)) {
             $existingfile->delete();
         }
-        if ($file = $fs->create_file_from_pathname($entry, $path)) {
+        if ($file = $fs->create_file_from_pathname($entry, $thefile)) {
             if (empty($CFG->repository_no_delete)) {
-                $delete = unlink($path);
+                $delete = unlink($thefile);
                 unset($CFG->repository_no_delete);
             }
-            $ret = $browser->get_file_info($context, $file->get_filearea(), $file->get_itemid(), $file->get_filepath(), $file->get_filename());
-            if(!empty($ret)) {
+            $fileinfo = $browser->get_file_info($context, $file->get_filearea(), $file->get_itemid(), $file->get_filepath(), $file->get_filename());
+            if(!empty($fileinfo)) {
                 return array(
-                    'url'=>$ret->get_url(),
+                    'url'=>$fileinfo->get_url(),
                     'id'=>$file->get_itemid(),
                     'file'=>$file->get_filename(),
-                    'icon' => $OUTPUT->pix_url(file_extension_icon($path, 32))
+                    'icon' => $OUTPUT->pix_url(file_extension_icon($thefile, 32))
                 );
             } else {
                 return null;
@@ -1234,14 +1232,13 @@ abstract class repository {
      */
     final public function get_meta() {
         global $CFG;
-        $ft = new file_type_to_ext;
+        $ft = new filetype_parser;
         $meta = new stdclass;
         $meta->id   = $this->id;
         $meta->name = $this->get_name();
         $meta->type = $this->options['type'];
         $meta->icon = $CFG->httpswwwroot.'/repository/'.$meta->type.'/icon.png';
-        $meta->supported_types = $ft->get_file_ext($this->supported_filetypes());
-        $meta->accepted_types = $this->options['accepted_types'];
+        $meta->supported_types = $ft->get_extensions($this->supported_filetypes());
         $meta->return_types = $this->supported_returntypes();
         return $meta;
     }
@@ -1420,8 +1417,8 @@ abstract class repository {
     public function filter(&$value) {
         $pass = false;
         $accepted_types = optional_param('accepted_types', '', PARAM_RAW);
-        $ft = new file_type_to_ext;
-        $ext = $ft->get_file_ext($this->supported_filetypes());
+        $ft = new filetype_parser;
+        $ext = $ft->get_extensions($this->supported_filetypes());
         if (isset($value['children'])) {
             $pass = true;
             if (!empty($value['children'])) {
@@ -1753,161 +1750,90 @@ function repository_setup_default_plugins() {
     return true;
 }
 
-/**
- * Loads file picker Javascript files
- *
- * @return void
- */
-function repository_head_setup() {
-    global $PAGE;
-
-    $PAGE->requires->yui2_lib('yahoo');
-    $PAGE->requires->yui2_lib('dom');
-    $PAGE->requires->yui2_lib('element');
-    $PAGE->requires->yui2_lib('event');
-    $PAGE->requires->yui2_lib('json');
-    $PAGE->requires->yui2_lib('treeview');
-    $PAGE->requires->yui2_lib('dragdrop');
-    $PAGE->requires->yui2_lib('container');
-    $PAGE->requires->yui2_lib('resize');
-    $PAGE->requires->yui2_lib('layout');
-    $PAGE->requires->yui2_lib('connection');
-    $PAGE->requires->yui2_lib('button');
-    $PAGE->requires->yui2_lib('selector');
-
-    //TODO: remove the ->in_head() once we refactor the inline script tags in repo code
-    $PAGE->requires->js('repository/repository.src.js')->in_head();
-
-}
-
-/**
- * Return javascript to create file picker to browse repositories
- *
- * @global object $CFG
- * @global object $USER
- * @global object $PAGE
- * @global object $OUTPUT
- * @param object $context the context
- * @param string $id unique id for every file picker
- * @param string $accepted_filetypes
- * @param string $returntypes the return value of file picker
- * @return string
- */
-function repository_get_client($context, $id = '',  $accepted_filetypes = '*', $returntypes = 3) {
+function initialise_filepicker($args) {
     global $CFG, $USER, $PAGE, $OUTPUT;
-
-    $ft = new file_type_to_ext();
-    $image_file_ext = json_encode($ft->get_file_ext(array('image')));
-    $video_file_ext = json_encode($ft->get_file_ext(array('video')));
-    $accepted_file_ext = json_encode($ft->get_file_ext($accepted_filetypes));
-
-    $js  = '';
-    if (!isset($CFG->filepickerjsloaded)) {
-        $lang = array();
-        $lang['title'] = get_string('title', 'repository');
-        $lang['preview'] = get_string('preview', 'repository');
-        $lang['add']     = get_string('add', 'repository');
-        $lang['back']      = get_string('back', 'repository');
-        $lang['cancel']    = get_string('cancel');
-        $lang['close']     = get_string('close', 'repository');
-        $lang['ccache']    = get_string('cleancache', 'repository');
-        $lang['copying']   = get_string('copying', 'repository');
-        $lang['downbtn']   = get_string('getfile', 'repository');
-        $lang['download']  = get_string('downloadsucc', 'repository');
-        $lang['date']      = get_string('date', 'repository').': ';
-        $lang['error']     = get_string('error', 'repository');
-        $lang['emptylist'] = get_string('emptylist', 'repository');
-        $lang['filenotnull'] = get_string('filenotnull', 'repository');
-        $lang['federatedsearch'] = get_string('federatedsearch', 'repository');
-        $lang['help']      = get_string('help');
-        $lang['refresh']   = get_string('refresh', 'repository');
-        $lang['invalidjson'] = get_string('invalidjson', 'repository');
-        $lang['listview']  = get_string('listview', 'repository');
-        $lang['linkexternal'] = get_string('linkexternal', 'repository');
-        $lang['login']     = get_string('login', 'repository');
-        $lang['logout']    = get_string('logout', 'repository');
-        $lang['loading']   = get_string('loading', 'repository');
-        $lang['thumbview'] = get_string('thumbview', 'repository');
-        $lang['title']     = get_string('title', 'repository');
-        $lang['noresult']  = get_string('noresult', 'repository');
-        $lang['mgr']       = get_string('manageurl', 'repository');
-        $lang['noenter']   = get_string('noenter', 'repository');
-        $lang['save']      = get_string('save', 'repository');
-        $lang['saveas']    = get_string('saveas', 'repository').': ';
-        $lang['saved']     = get_string('saved', 'repository');
-        $lang['saving']    = get_string('saving', 'repository');
-        $lang['size']      = get_string('size', 'repository').': ';
-        $lang['sync']      = get_string('sync', 'repository');
-        $lang['search']    = get_string('search', 'repository');
-        $lang['searching'] = get_string('searching', 'repository');
-        $lang['submit']    = get_string('submit', 'repository');
-        $lang['preview']   = get_string('preview', 'repository');
-        $lang['popup']     = get_string('popup', 'repository');
-        $lang['upload']    = get_string('upload', 'repository').'...';
-        $lang['uploading'] = get_string('uploading', 'repository');
-        $lang['xhtml']     = get_string('xhtmlerror', 'repository');
-        $lang = json_encode($lang);
-
-        $options = array();
-        $sys_context = get_system_context();
-        $options['contextid'] = $sys_context->id;
-        $externallink = (int)get_config(null, 'repositoryallowexternallinks');
-        if (empty($externallink)) {
-            $options['externallink'] = false;
-        } else {
-            $options['externallink'] = true;
-        }
-        $options['icons']['loading'] = $OUTPUT->pix_url('i/loading');
-        $options['icons']['logout']  = $OUTPUT->pix_url('a/logout');
-        $options['icons']['help']    = $OUTPUT->pix_url('a/help');
-        $options['icons']['progressbar'] = $OUTPUT->pix_url('i/progressbar');
-        $options['icons']['search']  = $OUTPUT->pix_url('a/search');
-        $options['icons']['setting'] = $OUTPUT->pix_url('a/setting');
-        $options['icons']['refresh'] = $OUTPUT->pix_url('a/refresh');
-        $options = json_encode($options);
-        // fp_config includes filepicker options
-
-        $accepted_file_ext = json_encode($ft->get_file_ext($accepted_filetypes));
-        $js .= <<<EOD
-<script type="text/javascript">
-var fp_lang = $lang;
-var fp_config = $options;
-MOODLE.repository.extensions.image = $image_file_ext;
-MOODLE.repository.extensions.media = $video_file_ext;
-</script>
-EOD;
-
-        $CFG->filepickerjsloaded = true;
+    $ft = new filetype_parser();
+    if (empty($args->context)) {
+        $context = $PAGE->context;
     } else {
-        // if yui and repository javascript libs are loaded
-        $js = '';
+        $context = $args->context;
     }
+    $return = new stdclass;
+
+    $PAGE->requires->string_for_js('loading', 'repository');
+    $PAGE->requires->string_for_js('title', 'repository');
+    $PAGE->requires->string_for_js('preview', 'repository');
+    $PAGE->requires->string_for_js('add', 'repository');
+    $PAGE->requires->string_for_js('back', 'repository');
+    $PAGE->requires->string_for_js('cancel', 'moodle');
+    $PAGE->requires->string_for_js('close', 'repository');
+    $PAGE->requires->string_for_js('cleancache', 'repository');
+    $PAGE->requires->string_for_js('copying', 'repository');
+    $PAGE->requires->string_for_js('getfile', 'repository');
+    $PAGE->requires->string_for_js('downloadsucc', 'repository');
+    $PAGE->requires->string_for_js('date', 'repository').': ';
+    $PAGE->requires->string_for_js('error', 'repository');
+    $PAGE->requires->string_for_js('emptylist', 'repository');
+    $PAGE->requires->string_for_js('filenotnull', 'repository');
+    $PAGE->requires->string_for_js('federatedsearch', 'repository');
+    $PAGE->requires->string_for_js('help', 'moodle');
+    $PAGE->requires->string_for_js('refresh', 'repository');
+    $PAGE->requires->string_for_js('invalidjson', 'repository');
+    $PAGE->requires->string_for_js('listview', 'repository');
+    $PAGE->requires->string_for_js('linkexternal', 'repository');
+    $PAGE->requires->string_for_js('login', 'repository');
+    $PAGE->requires->string_for_js('logout', 'repository');
+    $PAGE->requires->string_for_js('loading', 'repository');
+    $PAGE->requires->string_for_js('iconview', 'repository');
+    $PAGE->requires->string_for_js('title', 'repository');
+    $PAGE->requires->string_for_js('noresult', 'repository');
+    $PAGE->requires->string_for_js('manageurl', 'repository');
+    $PAGE->requires->string_for_js('noenter', 'repository');
+    $PAGE->requires->string_for_js('save', 'repository');
+    $PAGE->requires->string_for_js('saveas', 'repository').': ';
+    $PAGE->requires->string_for_js('saved', 'repository');
+    $PAGE->requires->string_for_js('saving', 'repository');
+    $PAGE->requires->string_for_js('size', 'repository').': ';
+    $PAGE->requires->string_for_js('sync', 'repository');
+    $PAGE->requires->string_for_js('search', 'repository');
+    $PAGE->requires->string_for_js('searching', 'repository');
+    $PAGE->requires->string_for_js('submit', 'repository');
+    $PAGE->requires->string_for_js('preview', 'repository');
+    $PAGE->requires->string_for_js('popup', 'repository');
+    $PAGE->requires->string_for_js('upload', 'repository').'...';
+    $PAGE->requires->string_for_js('uploading', 'repository');
+    $PAGE->requires->string_for_js('xhtmlerror', 'repository');
 
-    // print instances listing
     $user_context = get_context_instance(CONTEXT_USER, $USER->id);
-    if (is_array($accepted_filetypes) && in_array('*', $accepted_filetypes)) {
-        $accepted_filetypes = '*';
-    }
-    $params = array();
-    $params['context'] = array($user_context, get_system_context());
-    $params['currentcontext'] = $context;
-    $params['accepted_types'] = $accepted_filetypes;
-    $params['returntypes'] = $returntypes;
-    $repos = repository::get_instances($params);
 
-    // print repository instances listing
-    $js .= <<<EOD
-<script type="text/javascript">
-MOODLE.repository.listing['$id'] = [];
-EOD;
-    foreach ($repos as $repo) {
-        $meta = $repo->get_meta();
-        $js .= "\r\n";
-        $js .= 'MOODLE.repository.listing[\''.$id.'\']['.$meta->id.']='.json_encode($meta).';';
-        $js .= "\n";
-    }
-    $js .= "\r\n";
-    $js .= "</script>";
+    $externallink = (int)get_config(null, 'repositoryallowexternallinks');
+    $repositories = repository::get_instances(array(
+        'context'=>array($user_context, get_system_context()),
+        'currentcontext'=> $context,
+        'accepted_types'=>$args->accepted_types
+    ));
 
-    return $js;
+    $return->repositories = array();
+
+    if (empty($externallink)) {
+        $return->externallink = false;
+    } else {
+        $return->externallink = true;
+    }
+
+    $return->pix = array();
+    $return->pix['loading'] = $OUTPUT->pix_url('i/loading')->out();
+    $return->pix['logout']  = $OUTPUT->pix_url('a/logout')->out();
+    $return->pix['help']    = $OUTPUT->pix_url('a/help')->out();
+    $return->pix['progressbar'] = $OUTPUT->pix_url('i/progressbar')->out();
+    $return->pix['search']  = $OUTPUT->pix_url('a/search')->out();
+    $return->pix['setting'] = $OUTPUT->pix_url('a/setting')->out();
+    $return->pix['refresh'] = $OUTPUT->pix_url('a/refresh')->out();
+    // provided by form element
+    $return->accepted_types = $ft->get_extensions($args->accepted_types);
+    foreach ($repositories as $repository) {
+        $meta = $repository->get_meta();
+        $return->repositories[$repository->id] = $meta;
+    }
+    return $return;
 }
diff --git a/repository/repository.js b/repository/repository.js
deleted file mode 100644
index 510be215330..00000000000
--- a/repository/repository.js
+++ /dev/null
@@ -1 +0,0 @@
-var id2clientid={};var id2itemid={};var repository_listing={};var cached_client_id={};var file_extensions={};var new_filename="";var cached_id;var cached_repo_id;var repository_client=(function(){var a="2.0";var d=(10*2);function b(){alert(a)}function c(h,f){if(YAHOO.env.ua.ie==6){var g=document.getElementById("file-picker-"+h);g.style.width=f}}function e(){this.create_filepicker=function(o){var m=(YAHOO.env.ua.ie&&document.compatMode=="BackCompat");var j=(YAHOO.env.ua.ie==6||(YAHOO.env.ua.ie==7&&m));var n={label:fp_lang.listview,value:"l",onclick:{fn:repository_client.view_as_list,obj:o}};var f={label:fp_lang.thumbview,value:"t",onclick:{fn:repository_client.view_as_icons,obj:o}};var h=document.createElement("DIV");h.id="file-picker-"+o;h.className="file-picker";this.client_id=o;document.body.appendChild(h);this.filepicker=new YAHOO.widget.Panel("file-picker-"+o,{draggable:true,close:true,underlay:"none",zindex:666666,monitorresize:false,xy:[50,YAHOO.util.Dom.getDocumentScrollTop()+20]});var l="";this.filepicker.client_id=o;this.filepicker.setHeader(fp_lang.title);this.filepicker.setBody('<div id="layout-'+o+'"></div>');this.filepicker.beforeRenderEvent.subscribe(function(){YAHOO.util.Event.onAvailable("layout-"+o,function(){l=new YAHOO.widget.Layout("layout-"+o,{height:480,width:700,units:[{position:"top",height:32,resize:false,body:'<div class="yui-buttongroup fp-viewbar" id="repo-viewbar-'+o+'"></div><div class="fp-searchbar" id="search-div-'+o+'"></div>',gutter:"2"},{position:"left",width:200,resize:true,scroll:true,body:'<ul class="fp-list" id="repo-list-'+o+'"></ul>',gutter:"0 5 0 2",minWidth:150,maxWidth:300},{position:"center",body:'<div class="fp-panel" id="panel-'+o+'"></div>',scroll:true,gutter:"0 2 0 0"}]});l.render()})});if(!YAHOO.env.ua.ie){var g=new YAHOO.util.Resize("file-picker-"+o,{handles:["br"],autoRatio:true,proxy:true,status:true,minWidth:680,minHeight:400});g.on("resize",function(q){var r=q.height;var p=this.header.offsetHeight;var t=(r-p);var s=(m)?t:t-d;YAHOO.util.Dom.setStyle(this.body,"height",s+"px");c(this.client_id,"680px");if(j){this.sizeUnderlay();this.syncIframe()}l.set("height",s);l.set("width",(q.width-d));l.resize()},this.filepicker,true)}repository_client.fp[o].viewbar=new YAHOO.widget.ButtonGroup({id:"btngroup-"+o,name:"buttons",disabled:true,container:"repo-viewbar-"+o});repository_client.fp[o].viewbar.addButtons([f,n]);this.print_listing();this.filepicker.render()};this.init_search=function(){var f=document.getElementById("search-div-"+this.client_id);f.innerHTML='<input id="search-input-'+this.client_id+'" /><button id="search-btn-'+this.client_id+'">'+fp_lang.federatedsearch+"</button>";var g=new YAHOO.util.Element("search-btn-"+this.client_id);g.client_id=this.client_id;var h=new YAHOO.util.Element("search-input-"+this.client_id);h.client_id=this.client_id;g.fnSearch=function(o){var m=new YAHOO.util.Element("search-input-"+this.client_id);var j=m.get("value");var n=repository_client.fp[this.client_id];var p=[];p.s=j;p.env=n.env;p.accepted_types=n.accepted_types;p.sesskey=moodle_cfg.sesskey;p.ctx_id=fp_config.contextid;p.client_id=this.client_id;repository_client.loading(this.client_id,"load");var l=YAHOO.util.Connect.asyncRequest("POST",moodle_cfg.wwwroot+"/repository/ws.php?action=gsearch",this.search_cb,repository_client.postdata(p))};g.on("contentReady",function(){g.on("click",this.fnSearch,this.input_keyword)});g.search_cb={success:function(p){var n=repository_client.parse_json(p.responseText,"global_search_cb");var j=new YAHOO.util.Element("panel-"+n.client_id);if(!n.list||n.list.length<1){j.get("element").innerHTML=fp_lang.noresult;return}var m=repository_client.fp[n.client_id];m.view_staus=0;m.fs=n.list;if(n.gsearch){m.gsearch=true}if(m.view_staus){repository_client.view_as_list(n.client_id,n.list)}else{repository_client.view_as_icons(n.client_id,n.list)}var l=new YAHOO.util.Element("search-input-"+n.client_id);l.set("value","")}};h.on("contentReady",function(){var j=document.getElementById("search-input-"+this.client_id);var l=new YAHOO.util.KeyListener(j,{keys:13},{fn:function(){this.fnSearch()},scope:g,correctScope:true});l.enable()})};this.print_listing=function(){var f=new YAHOO.util.Element("repo-list-"+this.client_id);f.set("innerHTML","");f.on("contentReady",function(){this.init_search();for(var m in repository_listing[this.client_id]){var l=repository_listing[this.client_id][m];var o=false;if(this.env=="editor"&&this.accepted_types!="*"){if(l.supported_types!="*"){for(var h in l.supported_types){if(mdl_in_array(l.supported_types[h],this.accepted_types)){o=true}}}}else{o=true}if(l.type=="draft"&&this.env=="filemanager"){continue}if(l.supported_types=="*"||o){var g=document.createElement("li");g.id="repo-"+this.client_id+"-"+l.id;var n=document.createElement("img");n.src=l.icon;n.width="16";n.height="16";var p=document.createElement("a");p.href="###";p.id="repo-call-"+this.client_id+"-"+l.id;p.appendChild(n);p.className="fp-repo-name";p.innerHTML+=" "+l.name;p.onclick=function(){var s=new RegExp("repo-call-(\\w+)-(\\d+)","i");var j=this.id.match(s);var v=j[1];var r=j[2];for(var u in repository_listing[v]){var t="repo-call-"+v+"-"+u;var q=document.getElementById(t);if(q){q.style.background="transparent"}}this.style.background="#CCC";repository_client.req(v,r,"")};g.appendChild(p);f.appendChild(g);l=null}}},this,true)};this.show=function(){this.print_listing();var f=new YAHOO.util.Element("panel-"+this.filepicker.client_id);f.get("element").innerHTML="";this.filepicker.show()};this.hide=function(){this.filepicker.hide()}}e.fp={};return e})();repository_client.req=function(g,f,d,c){repository_client.loading(g,"load");this.fp[g].viewbar.set("disabled",false);var b=repository_client.fp[g];var e=[];e.p=d;e.env=b.env;e.sesskey=moodle_cfg.sesskey;e.ctx_id=fp_config.contextid;e.client_id=g;e.repo_id=f;e.itemid=repository_client.fp[g].itemid;if(!!c){e.page=c}e.accepted_types=b.accepted_types;var a=YAHOO.util.Connect.asyncRequest("POST",moodle_cfg.wwwroot+"/repository/ws.php?action=list",this.req_cb,this.postdata(e))};repository_client.req_cb={success:function(d){var c=repository_client.parse_json(d.responseText,"req_cb");var b=repository_client.fp[c.client_id];b.viewbar.set("disabled",false);var a=new YAHOO.util.Element("panel-"+c.client_id);if(c&&c.e){a.get("element").innerHTML='<div class="fp-error">'+c.e+"</div>";return}b.fs=c;if(!c){return}else{if(c.iframe){repository_client.view_iframe(c.client_id)}else{if(c.login){b.viewbar.set("disabled",true);repository_client.print_login(c.client_id,c)}else{if(c.list){if(b.view_status){repository_client.view_as_list(c.client_id,c.list)}else{repository_client.view_as_icons(c.client_id,c.list)}}}}}if(c.msg){repository_client.print_msg(c.msg,c.client_id)}}};repository_client.print_msg=function(b,c){var a=new YAHOO.util.Element("panel-"+c);a.get("element").innerHTML='<div class="fp-msg">'+b+"</div>"+a.get("element").innerHTML};repository_client.view_iframe=function(c){var a=repository_client.fp[c].fs;var b=new YAHOO.util.Element("panel-"+c);b.get("element").innerHTML='<iframe frameborder="0" width="98%" height="400px" src="'+a.iframe+'" />'};repository_client.req_search_results=function(g,f,d,c){repository_client.loading(g,"load");this.fp[g].viewbar.set("disabled",false);var b=repository_client.fp[g];var e=[];e.p=d;e.env=b.env;e.sesskey=moodle_cfg.sesskey;e.ctx_id=fp_config.contextid;e.client_id=g;e.search_paging="true";e.repo_id=f;if(!!c){e.page=c}e.accepted_types=b.accepted_types;var a=YAHOO.util.Connect.asyncRequest("POST",moodle_cfg.wwwroot+"/repository/ws.php?action=search",this.req_cb,this.postdata(e))};repository_client.print_login=function(b,j){var p=j.login;var a=new YAHOO.util.Element("panel-"+b);var g="login";if(j.login_btn_action){g=j.login_btn_action}var o='<div class="fp-login-form" onkeypress="repository_client.login_keypress(event,\''+g+"')\">";var f=false;this.fp[b].login=p;o+='<table width="100%">';for(var h in p){o+="<tr>";if(p[h].type=="popup"){o+='<td colspan="2"><p class="fp-popup">'+fp_lang.popup+"</p>";o+='<p class="fp-popup"><button onclick="repository_client.popup(\''+b+"', '"+p[h].url+"')\">"+fp_lang.login+"</button>";o+="</p></td>";f=true}else{if(p[h].type=="textarea"){o+='<td colspan="2"><p><textarea id="'+p[h].id+'" name="'+p[h].name+'"></textarea></p></td>'}else{if(p[h].type=="select"){o+='<td align="right"><label>'+p[h].label+':</label></td><td align="left"><select id="'+p[h].id+'" name="'+p[h].name+'">';for(i in p[h].options){o+='<option value="'+p[h].options[i].value+'">'+p[h].options[i].label+"</option>"}o+="</select></td>"}else{var d="";var q="";var s="";if(p[h].id){d=' for="'+p[h].id+'"';q=' id="'+p[h].id+'"'}if(p[h].label){o+='<td align="right" valign="top"><label'+d+">"+p[h].label+"</label> </td>"}else{o+="<td></td>"}if(p[h].value){s=' value="'+p[h].value+'"'}if(p[h].type=="radio"){var n=p[h].value.split("|");var l=p[h].value_label.split("|");o+='<td align="left">';for(var r in n){o+='<input type="'+p[h].type+'" name="'+p[h].name+'"'+q+' value="'+n[r]+'" />'+l[r]+"<br />"}o+="</td>"}else{o+='<td align="left"><input type="'+p[h].type+'" name="'+p[h].name+'"'+s+" "+q+" /></td>"}}}}o+="</tr>"}o+="</table>";var c=j.login_btn_label?j.login_btn_label:fp_lang.submit;if(j.login_btn_action=="search"){o+='<p><input type="button" onclick="repository_client.search(\''+b+"', '"+j.repo_id+'\')" value="'+c+'" /></p>'}else{if(j.login_btn_action=="download"){o+='<p><input type="button" onclick="repository_client.download(\''+b+"', '"+j.repo_id+'\')" value="'+c+'" /></p>'}else{if(!f){o+='<p><input type="button" onclick="repository_client.login(\''+b+"', '"+j.repo_id+'\')" value="'+c+'" /></p>'}}}o+="</div>";try{a.get("element").innerHTML=o}catch(m){alert(m.toString()+fp_lang.xhtml)}cached_id=b;cached_repo_id=j.repo_id};repository_client.login=function(g,d){var f=[];var e=this.fp[g].login;for(var a in e){if(e[a].type!="popup"){var c=document.getElementsByName(e[a].name)[0];f[e[a].name]="";if(c.type=="checkbox"){f[e[a].name]=c.checked}else{f[e[a].name]=c.value}}}f.env=this.fp[g].env;f.repo_id=d;f.client_id=g;f.ctx_id=fp_config.contextid;f.sesskey=moodle_cfg.sesskey;f.accepted_types=this.fp[g].accepted_types;this.loading(g,"load");var b=YAHOO.util.Connect.asyncRequest("POST",moodle_cfg.wwwroot+"/repository/ws.php?action=sign",this.req_cb,this.postdata(f))};repository_client.login_keypress=function(a,c){a=(a)?a:((window.event)?window.event:"");var b=a.keyCode?a.keyCode:a.which;if(b==13||b==10){if(c=="search"){repository_client.search(cached_id,cached_repo_id)}else{if(c=="download"){repository_client.download(cached_id,cached_repo_id)}else{repository_client.login(cached_id,cached_repo_id)}}}};repository_client.search=function(a,h){var c=[];var e=this.fp[a].login;for(var d in e){if(e[d].type!="popup"){var b=document.getElementsByName(e[d].name)[0];c[e[d].name]="";if(b.type=="checkbox"){c[e[d].name]=b.checked}else{if(b.type=="radio"){var f=document.getElementsByName(e[d].name);for(var g in f){if(f[g].checked){c[e[d].name]=f[g].value}}}else{c[e[d].name]=b.value}}}}c.env=this.fp[a].env;c.repo_id=h;c.client_id=a;c.ctx_id=fp_config.contextid;c.sesskey=moodle_cfg.sesskey;c.accepted_types=this.fp[a].accepted_types;this.loading(a,"load");var j=YAHOO.util.Connect.asyncRequest("POST",moodle_cfg.wwwroot+"/repository/ws.php?action=search",this.req_cb,this.postdata(c))};repository_client.loading=function(g,c,b){var a=new YAHOO.util.Element("panel-"+g);a.get("element").innerHTML="";var f='<div style="text-align:center">';if(c=="load"){f+='<img src="'+fp_config.icons.loading+'" />';f+="<p>"+fp_lang.loading+"</p>"}else{f+='<img src="'+fp_config.icons.progressbar+'" />';f+="<p>"+fp_lang.copying+" <strong>"+b+"</strong></p>"}f+="</div>";try{a.get("element").innerHTML=f}catch(d){alert(d.toString())}};repository_client.view_as_list=function(e,d){if(typeof e=="object"){e=d;list=repository_client.fp[e].fs.list}else{if(!d){list=repository_client.fp[e].fs.list}else{list=d}}var b=new YAHOO.util.Element("panel-"+e);var c=repository_client.fp[e];c.view_status=1;c.viewbar.check(1);repository_client.print_header(e);b.get("element").innerHTML+='<div id="treediv-'+e+'"></div>';var a=new YAHOO.widget.TreeView("treediv-"+e);a.dynload=function(j,f){var m={success:function(p){var n=repository_client.parse_json(p.responseText,"dynload");for(k in n.list){repository_client.buildtree(n.client_id,n.list[k],j)}p.argument.fnLoadComplete()},failure:function(n){alert(fp_lang.error+" - |dynload| -");n.argument.fnLoadComplete()},argument:{node:j,fnLoadComplete:f}};var g=repository_client.fp[j.client_id];var l=[];l.p=j.path;l.env=g.env;l.sesskey=moodle_cfg.sesskey;l.ctx_id=fp_config.contextid;l.repo_id=g.fs.repo_id;l.client_id=j.client_id;l.accepted_types=g.accepted_types;var h=YAHOO.util.Connect.asyncRequest("POST",moodle_cfg.wwwroot+"/repository/ws.php?action=list",m,repository_client.postdata(l))};a.dynload.client_id=e;if(c.fs.dynload){a.setDynamicLoad(a.dynload,1)}else{}for(k in list){repository_client.buildtree(e,list[k],a.getRoot())}a.draw();a.subscribe("clickEvent",function(f){if(f.node.isLeaf){repository_client.select_file(f.node.data.filename,f.node.data.value,f.node.data.icon,e,f.node.repo_id)}});repository_client.print_footer(e)};repository_client.buildtree=function(j,d,h){var a=repository_client.fp[j].fs;if(d.children){d.title="<i><u>"+d.title+"</u></i>"}var f={label:d.title,title:fp_lang.date+" "+d.date+fp_lang.size+" "+d.size,filename:d.title,value:d.source,icon:d.thumbnail,path:d.path};var b=new YAHOO.widget.TextNode(f,h,false);var e=new YAHOO.widget.Tooltip(b.labelElId,{context:b.labelElId,text:f.title});if(d.repo_id){b.repo_id=d.repo_id}else{b.repo_id=a.repo_id}if(d.children){if(d.expanded){b.expand()}b.isLeaf=false;b.client_id=j;if(d.path){b.path=d.path}else{b.path=""}for(var g in d.children){this.buildtree(j,d.children[g],b)}}else{b.isLeaf=true}};repository_client.select_file=function(h,c,g,d,m){if(repository_client.files[d]==undefined){repository_client.files[d]=0}if(repository_client.files[d]>=repository_client.fp[d].maxfiles&&repository_client.fp[d].maxfiles!=-1){alert("Only "+repository_client.fp[d].maxfiles+" files are allowed!");return false}var b=document.getElementById("fp-grid-panel-"+d);if(b){b.style.display="none"}var f=document.getElementById("fp-header-"+d);f.style.display="none";var j=document.getElementById("fp-footer-"+d);j.style.display="none";var l=document.getElementById("path-"+d);if(l){l.style.display="none"}var a=new YAHOO.util.Element("panel-"+d);var e='<div class="fp-rename-form">';e+='<p><img src="'+g+'" /></p>';e+='<p><label for="newname-'+d+'">'+fp_lang.saveas+"</label>";e+='<input type="text" id="newname-'+d+'" value="" /></p>';e+='<p><input type="hidden" id="fileurl-'+d+'" value="'+c+'" />';e+='<input type="button" onclick="repository_client.download(\''+d+"', '"+m+'\')" value="'+fp_lang.downbtn+'" />';e+='<input type="button" onclick="repository_client.viewfiles(\''+d+'\')" value="'+fp_lang.cancel+'" /></p>';e+="</div>";a.get("element").innerHTML+=e;document.getElementById("newname-"+d).value=h;var n=document.getElementById("treediv-"+d);if(n){n.style.display="none"}};repository_client.paging=function(d,a){var g="";this.fp[d].view_staus=0;var e=this.fp[d].fs;if(e.pages){g+='<div class="fp-paging" id="paging-'+a+"-"+d+'">';if(!e.search_result){var b="req"}else{var b="req_search_results"}g+=this.get_page_btn(d,b,1)+"1</a> ";var j=5;var f=(j-1)/2;if(e.page+f>=e.pages){var h=e.pages}else{if(e.page<j){var h=j}else{var h=e.page+f}}if(e.page>=j){g+=" ... ";for(var c=e.page-f;c<h;c++){g+=this.get_page_btn(d,b,c);g+=String(c);g+="</a> "}}else{for(var c=2;c<h;c++){g+=this.get_page_btn(d,b,c);g+=String(c);g+="</a> "}}if(h==e.pages){g+=this.get_page_btn(d,b,e.pages)+e.pages+"</a>"}else{g+=repository_client.get_page_btn(d,b,h)+h+"</a>";g+=" ... "+repository_client.get_page_btn(d,b,e.pages)+e.pages+"</a>"}g+="</div>"}return g};repository_client.get_page_btn=function(e,c,d){var a=this.fp[e].fs;var b="";if(d==a.page){b='class="cur_page"'}str="<a "+b+' onclick="repository_client.'+c+"('"+e+"',"+a.repo_id+", "+d+", "+d+')" href="###">';return str};repository_client.path=function(h){var a=this.fp[h].fs;if(this.fp[h].view_status==1){return}var b=new YAHOO.util.Element("panel-"+h);var g=a.path;if(g&&g.length!=0){var d=document.createElement("DIV");d.id="path-"+h;d.className="fp-pathbar";b.get("element").appendChild(d);for(var e=0;e<a.path.length;e++){var f=document.createElement("A");f.href="###";f.innerHTML=a.path[e].name;f.id="path-"+h+"-"+a.repo_id;f.path=a.path[e].path;f.onclick=function(){var m=new RegExp("path-(\\w+)-(\\d+)","i");var j=this.id.match(m);var n=j[1];var l=j[2];repository_client.req(n,l,this.path)};var c=document.createElement("SPAN");c.innerHTML="/";d.appendChild(f);d.appendChild(c)}}};repository_client.print_header=function(c){var a=new YAHOO.util.Element("panel-"+c);var b='<div id="fp-header-'+c+'">';b+='<div class="fp-toolbar" id="repo-tb-'+c+'"></div>';if(this.fp[c].fs.pages<8){b+=this.paging(c,"header")}b+="</div>";a.set("innerHTML",b);this.path(c)};repository_client.view_as_icons=function(j,l){var n=null;if(typeof j=="object"){j=l;n=repository_client.fp[j].fs.list}else{if(!l){n=repository_client.fp[j].fs.list}else{n=l}}var o=repository_client.fp[j];o.view_status=0;o.viewbar.check(0);var b=document.getElementById("panel-"+j);var a=document.createElement("DIV");a.id="fp-grid-panel-"+j;repository_client.print_header(j);var m=0;for(k in n){var e=document.createElement("div");e.className="fp-grid";var q=document.createElement("div");q.id="grid-title-"+String(m);q.className="label";if(n[k].shorttitle){n[k].title=n[k].shorttitle}q.innerHTML+='<a href="###"><span>'+n[k].title+"</span></a>";if(n[k].thumbnail_width){e.style.width=n[k].thumbnail_width+"px";q.style.width=(n[k].thumbnail_width-10)+"px"}else{e.style.width=q.style.width="80px"}var d=document.createElement("DIV");d.style.textAlign="center";if(n[k].thumbnail_height){d.style.height=n[k].thumbnail_height+"px"}var h=document.createElement("img");h.src=n[k].thumbnail;if(n[k].thumbnail_alt){h.alt=n[k].thumbnail_alt}if(n[k].thumbnail_title){h.title=n[k].thumbnail_title}var p=document.createElement("A");p.href="###";p.id="img-id-"+String(m);if(n[k].url){e.innerHTML+='<p><a target="_blank" href="'+n[k].url+'">'+fp_lang.preview+"</a></p>"}p.appendChild(h);d.appendChild(p);e.appendChild(d);if(o.fs.draftfiles&&!n[k].children){var r=document.createElement("A");r.href="###";r.innerHTML="[X]";r.id="del-id-"+String(m);e.appendChild(r);r.itemid=o.itemid;r.client_id=j;r.title=n[k].title;r.repo_id=o.fs.repo_id;r.onclick=function(){if(confirm("Sure?")){var t=[];t.client_id=this.client_id;t.itemid=this.itemid;t.title=this.title;var s=YAHOO.util.Connect.asyncRequest("POST",moodle_cfg.wwwroot+"/repository/ws.php?action=delete",this,repository_client.postdata(t))}};r.success=function(s){repository_client.req(s.responseText,this.repo_id)}}e.appendChild(q);a.appendChild(e);if(n[k].children){var c=new YAHOO.util.Element(p.id);c.path=n[k].path;var g=new YAHOO.util.Element(q.id);c.fs=n[k].children;c.on("contentReady",function(){this.on("click",function(){if(o.fs.dynload){var s=repository_client.fp[j].fs;var u=[];u.p=this.path;u.env=repository_client.fp[j].env;u.repo_id=s.repo_id;u.ctx_id=fp_config.contextid;u.sesskey=moodle_cfg.sesskey;u.accepted_types=repository_client.fp[j].accepted_types;u.client_id=j;repository_client.loading(j,"load");var t=YAHOO.util.Connect.asyncRequest("POST",moodle_cfg.wwwroot+"/repository/ws.php?action=list",repository_client.req_cb,repository_client.postdata(u))}else{repository_client.view_as_icons(j,this.fs)}})});g.on("contentReady",function(){this.on("click",function(){c.fireEvent("click")})})}else{var g=new YAHOO.util.Element(q.id);var f=new YAHOO.util.Element(p.id);g.filename=f.filename=n[k].title;g.value=f.value=n[k].source;g.icon=f.icon=n[k].thumbnail;if(o.fs.repo_id){g.repo_id=f.repo_id=o.fs.repo_id}else{if(n[k].repo_id){g.repo_id=f.repo_id=n[k].repo_id}else{g.repo_id=f.repo_id=""}}f.on("contentReady",function(){this.on("click",function(){repository_client.select_file(this.filename,this.value,this.icon,j,this.repo_id)})});g.on("contentReady",function(){this.on("click",function(){repository_client.select_file(this.filename,this.value,this.icon,j,this.repo_id)})})}m++}if(n.length==0&&!o.fs.upload){a.innerHTML='<div class="fp-error">'+fp_lang.emptylist+"</div>"}b.appendChild(a);repository_client.print_footer(j)};repository_client.print_footer=function(d){var g=this.fp[d].fs;var a=document.getElementById("panel-"+d);var h=document.createElement("DIV");h.id="fp-footer-"+d;h.innerHTML+=this.create_upload_form(d);h.innerHTML+=this.paging(d,"footer");a.appendChild(h);var b=document.getElementById("repo-tb-"+d);if(this.fp[d].gsearch){this.fp[d].gsearch="";return}if(!g.nosearch){var f=document.createElement("img");f.src=fp_config.icons.search;var m=document.createElement("A");m.href="###";m.appendChild(document.createTextNode(fp_lang.search));b.appendChild(f);b.appendChild(m);m.onclick=function(){repository_client.search_form(d,g.repo_id)}}if(!g.norefresh){var f=document.createElement("img");f.src=fp_config.icons.refresh;var e=document.createElement("A");e.href="###";e.appendChild(document.createTextNode(fp_lang.refresh));b.appendChild(f);b.appendChild(e);e.onclick=function(){var o=[];o.env=g.env;o.sesskey=moodle_cfg.sesskey;o.ctx_id=fp_config.contextid;o.repo_id=g.repo_id;o.client_id=d;repository_client.loading(d,"load");var n=YAHOO.util.Connect.asyncRequest("POST",moodle_cfg.wwwroot+"/repository/ws.php?action=ccache",repository_client.req_cb,repository_client.postdata(o))}}if(g.manage){var j=document.createElement("A");j.innerHTML='<img src="'+fp_config.icons.setting+'" /> '+fp_lang.mgr;j.href=g.manage;j.target="_blank";b.appendChild(j)}if(!g.nologin){var l=document.createElement("A");l.href="###";l.innerHTML='<img src="'+fp_config.icons.logout+'" /> '+fp_lang.logout;b.appendChild(l);l.onclick=function(){repository_client.logout(d,g.repo_id)}}if(g.help){var c=document.createElement("A");c.href=g.help;c.target="_blank";c.innerHTML='<img src="'+fp_config.icons.help+'" /> '+fp_lang.help;b.appendChild(c)}};repository_client.postdata=function(a){var b="";for(k in a){if(a[k] instanceof Array){for(i in a[k]){b+=(encodeURIComponent(k)+"[]="+encodeURIComponent(a[k][i]));b+="&"}}else{b+=encodeURIComponent(k)+"="+encodeURIComponent(a[k]);b+="&"}}return b};repository_client.popup=function(b,a){window.open(a,"repo_auth","location=0,status=0,scrollbars=0,width=500,height=300");cached_client_id=b;return true};function repository_callback(a){repository_client.req(cached_client_id,a,"")}repository_client.logout=function(d,b){var c=[];c.repo_id=b;c.client_id=d;var a=YAHOO.util.Connect.asyncRequest("POST",moodle_cfg.wwwroot+"/repository/ws.php?action=logout",repository_client.req_cb,repository_client.postdata(c))};repository_client.download=function(g,d){var a=repository_client.fp[g];var f=document.getElementById("newname-"+g).value;new_filename=f;var c=document.getElementById("fileurl-"+g).value;repository_client.loading(g,"download",f);var e=[];if(a.itemid){e.itemid=a.itemid}e.env=a.env;e.file=c;e.savepath=a.savepath;e.title=f;e.sesskey=moodle_cfg.sesskey;e.ctx_id=fp_config.contextid;e.repo_id=d;e.client_id=g;var b=YAHOO.util.Connect.asyncRequest("POST",moodle_cfg.wwwroot+"/repository/ws.php?action=download",repository_client.download_cb,repository_client.postdata(e))};repository_client.download_cb={success:function(c){var b=repository_client.parse_json(c.responseText,"download_cb");var a=new YAHOO.util.Element("panel-"+b.client_id);if(b&&b.e){a.get("element").innerHTML=b.e;return}if(repository_client.files[b.client_id]==undefined){repository_client.files[b.client_id]=0}else{repository_client.files[b.client_id]++}repository_client.end(b.client_id,b)}};repository_client.end=function(c,b){var a=repository_client.fp[c];if(repository_client.files[c]==undefined){repository_client.files[c]=0}if(a.env=="filepicker"){a.target.value=b.id}else{if(a.env=="editor"){if(b.type=="link"){a.target.value=b.url+"#"+new_filename}else{a.target.value=b.url}a.target.onchange()}}b.filepath=a.savepath;b.maxfileslimit=(a.maxfiles!=-1&&repository_client.files[c]>=a.maxfiles);a.formcallback(b);a.hide();repository_client.viewfiles(c)};repository_client.viewfiles=function(b){var a=repository_client.fp[b];if(a.view_status){repository_client.view_as_list(b)}else{repository_client.view_as_icons(b)}};repository_client.create_upload_form=function(d){var b="";var a=repository_client.fp[d].fs;if(a.upload){var c=a.upload.id+"_"+d;b+='<div id="'+c+'_div" class="fp-upload-form">';b+='<form id="'+c+'" onsubmit="return false">';b+='<label for="'+c+'_file">'+a.upload.label+": </label>";b+='<input type="file" id="'+c+'_file" name="repo_upload_file" />';b+='<div class="fp-upload-btn"><a href="###" onclick="return repository_client.upload(\''+d+"');\">"+fp_lang.upload+"</a></div>";b+="</form>";b+="</div>"}return b};repository_client.upload=function(e){var g=repository_client.fp[e];var l=repository_client.fp[e].fs;var b=l.upload.id+"_"+e;var h=document.getElementById(b);var j=document.getElementById(b+"_div");var f=document.getElementById(b+"_file");if(f.value!=""&&f.value!=null){var a=document.createElement("DIV");a.id=b+"_loading";a.style.textAlign="center";var c=document.createElement("IMG");c.src=fp_config.icons.progressbar;var n=document.createElement("p");n.innerHTML=fp_lang.uploading;a.appendChild(n);a.appendChild(c);j.appendChild(a);YAHOO.util.Connect.setForm(h,true,true);var m=YAHOO.util.Connect.asyncRequest("POST",moodle_cfg.wwwroot+"/repository/ws.php?action=upload&itemid="+g.itemid+"&sesskey="+moodle_cfg.sesskey+"&ctx_id="+fp_config.contextid+"&savepath="+g.savepath+"&repo_id="+l.repo_id+"&client_id="+e,repository_client.upload_cb)}else{alert(fp_lang.filenotnull)}};repository_client.upload_cb={upload:function(c){var b=repository_client.parse_json(c.responseText,"upload");client_id=b.client_id;if(b&&b.e){var a=new YAHOO.util.Element("panel-"+client_id);a.get("element").innerHTML=b.e;return}if(b){repository_client.end(client_id,b)}}};repository_client.parse_json=function(a,c){try{var b=YAHOO.lang.JSON.parse(a)}catch(d){alert(fp_lang.invalidjson+" - |"+c+"| -"+stripHTML(a))}return b};repository_client.search_form=function(e,d){var a=repository_client.fp[e];var c=[];c.env=a.env;c.sesskey=moodle_cfg.sesskey;c.client_id=e;c.ctx_id=fp_config.contextid;c.repo_id=d;var b=YAHOO.util.Connect.asyncRequest("POST",moodle_cfg.wwwroot+"/repository/ws.php?action=searchform",repository_client.search_form_cb,repository_client.postdata(c))};repository_client.search_form_cb={success:function(b){var d=repository_client.parse_json(b.responseText,"search_form_cb");var c=document.getElementById("fp-search-dlg");var f=repository_client.fp[d.client_id];if(c){c.innerHTML="";c.parentNode.removeChild(c)}var c=document.createElement("DIV");c.id="fp-search-dlg";var h=document.createElement("DIV");h.className="hd";h.innerHTML=fp_lang.searching+'"'+repository_listing[d.client_id][f.fs.repo_id].name+'"';var e=document.createElement("DIV");e.className="bd";var a=document.createElement("FORM");a.method="POST";a.id="fp-search-form";a.action=moodle_cfg.wwwroot+"/repository/ws.php?action=search";a.innerHTML=d.form;e.appendChild(a);c.appendChild(h);c.appendChild(e);document.body.appendChild(c);var j=function(){var n=j.client_id;repository_client.fp[n].viewbar.set("disabled",false);repository_client.loading(n,"load");YAHOO.util.Connect.setForm("fp-search-form",false,false);this.cancel();var l=moodle_cfg.wwwroot+"/repository/ws.php?action=search&env="+j.env+"&client_id="+n;var m=YAHOO.util.Connect.asyncRequest("POST",l,repository_client.req_cb)};j.client_id=d.client_id;j.env=f.env;var g=new YAHOO.widget.Dialog("fp-search-dlg",{postmethod:"async",draggable:true,width:"30em",fixedcenter:true,zindex:766667,visible:false,constraintoviewport:true,buttons:[{text:fp_lang.submit,handler:j,isDefault:true},{text:fp_lang.cancel,handler:function(){this.destroy()}}]});g.render();g.show()}};repository_client.files={};var mdl_in_array=function(d,a){for(var c=0,b=a.length;c<b;c++){if(a[c]==d){return true}}return false};function open_filepicker(c,b){var a=repository_client.fp[c];if(!a){a=new repository_client();a.env=b.env;a.target=b.target;if(b.itemid){a.itemid=b.itemid}else{if(tinyMCE&&id2itemid[tinyMCE.selectedInstance.editorId]){a.itemid=id2itemid[tinyMCE.selectedInstance.editorId]}}if(b.callback){a.formcallback=b.callback}else{a.formcallback=function(){}}repository_client.fp[c]=a;a.create_filepicker(c)}else{a.target=b.target;a.show()}a.savepath=b.savepath;if(b.filetype){if(b.filetype=="image"){a.accepted_types=file_extensions.image}else{if(b.filetype=="video"||b.filetype=="media"){a.accepted_types=file_extensions.media}else{if(b.filetype=="file"){a.accepted_types="*"}}}}else{a.accepted_types="*"}if(!b.maxfiles){b.maxfiles=-1}a.maxfiles=b.maxfiles;return a}function id2_add_clientid(b,a){id2clientid[b]=a}function id2_add_itemid(b,a){id2itemid[b]=a};
\ No newline at end of file
diff --git a/repository/repository.src.js b/repository/repository.src.js
deleted file mode 100644
index 6b321a0e12f..00000000000
--- a/repository/repository.src.js
+++ /dev/null
@@ -1,1314 +0,0 @@
-// File picker core Javascript code for Moodle
-// Author: Dongsheng Cai <dongsheng@moodle.com>
-
-/**
- * repository_client is a javascript class, it contains several static
- * methods you can call it directly without creating an instance.
- * If you are going to create a file picker, you need create an instance
- * repo = new repository_client();
- */
-
-if (!MOODLE) {
-    var MOODLE = {};
-}
-if (!MOODLE.repository) {
-    MOODLE.repository = {};
-}
-
-MOODLE.repository.listing = {};
-MOODLE.repository.extensions = {};
-MOODLE.repository.cache = {};
-MOODLE.repository.cache.client_id = {};
-
-/* when selected a file, filename will be cached in this varible */
-var new_filename = '';
-// will be used by login form
-var cached_id;
-var cached_repo_id;
-var id2clientid = {};
-var id2itemid   = {};
-
-/**
- * repository_client is a javascript class, it contains several static
- * methods you can call it directly without creating an instance.
- * If you are going to create a file picker, you need create an instance
- * repo = new repository_client();
- */
-var repository_client = (function(){
-    // private static field
-    var version = '2.0';
-    var PANEL_BODY_PADDING = (10*2);
-    // private static methods
-    function help() {
-        alert(version);
-    }
-    // a hack to fix ie6 bug
-    function ie6_fix_width(id, width) {
-        if(YAHOO.env.ua.ie == 6){
-            var fp_title = document.getElementById('file-picker-'+id);
-            fp_title.style.width = width;
-        }
-    }
-    function $() {
-        // public methods of filepicker instance
-        this.create_filepicker = function(client_id) {
-            var IE_QUIRKS = (YAHOO.env.ua.ie && document.compatMode == "BackCompat");
-            var IE_SYNC = (YAHOO.env.ua.ie == 6 || (YAHOO.env.ua.ie == 7 && IE_QUIRKS));
-            var btn_listing = {label: fp_lang.listview, value: 'l',
-                onclick: {fn: repository_client.view_as_list, obj:client_id}};
-            var btn_icons = {label: fp_lang.thumbview, value: 't',
-                onclick: {fn: repository_client.view_as_icons, obj:client_id}};
-            var el = document.createElement('DIV');
-            el.id = 'file-picker-'+client_id;
-            el.className = 'file-picker';
-            this.client_id = client_id;
-            document.body.appendChild(el);
-
-            MOODLE.repository.api = moodle_cfg.wwwroot+'/repository/repository_ajax.php';
-
-            this.filepicker = new YAHOO.widget.Panel('file-picker-' + client_id, {
-                draggable: true,
-                close: true,
-                underlay: 'none',
-                zindex: 666666,
-                monitorresize: false,
-                xy: [50, YAHOO.util.Dom.getDocumentScrollTop()+20]
-            });
-            var layout = '';
-            this.filepicker.client_id = client_id;
-            this.filepicker.setHeader(fp_lang['title']);
-            this.filepicker.setBody('<div id="layout-'+client_id+'"></div>');
-            this.filepicker.beforeRenderEvent.subscribe(function() {
-                YAHOO.util.Event.onAvailable('layout-'+client_id, function() {
-                    layout = new YAHOO.widget.Layout('layout-'+client_id, {
-                        height: 480, width: 700,
-                        units: [
-                        {position: 'top', height: 32, resize: false,
-                        body:'<div class="yui-buttongroup fp-viewbar" id="repo-viewbar-'+client_id+'"></div><div class="fp-searchbar" id="search-div-'+client_id+'"></div>', gutter: '2'},
-                        {position: 'left', width: 200, resize: true, scroll:true,
-                        body:'<ul class="fp-list" id="repo-list-'+client_id+'"></ul>', gutter: '0 5 0 2', minWidth: 150, maxWidth: 300 },
-                        {position: 'center', body: '<div class="fp-panel" id="panel-'+client_id+'"></div>',
-                        scroll: true, gutter: '0 2 0 0' }
-                        ]
-                    });
-                    layout.render();
-                });
-            });
-            if (!YAHOO.env.ua.ie) {
-                var resize = new YAHOO.util.Resize('file-picker-'+client_id, {
-                    handles: ['br'],
-                    autoRatio: true,
-                    proxy: true,
-                    status: true,
-                    minWidth: 680,
-                    minHeight: 400
-                });
-                resize.on('resize', function(args) {
-                    var panelHeight = args.height;
-                    var headerHeight = this.header.offsetHeight; // Content + Padding + Border
-                    var bodyHeight = (panelHeight - headerHeight);
-                    var bodyContentHeight = (IE_QUIRKS) ? bodyHeight : bodyHeight - PANEL_BODY_PADDING;
-                    YAHOO.util.Dom.setStyle(this.body, 'height', bodyContentHeight + 'px');
-                    ie6_fix_width(this.client_id, '680px');
-                    if (IE_SYNC) {
-                        this.sizeUnderlay();
-                        this.syncIframe();
-                    }
-                    layout.set('height', bodyContentHeight);
-                    layout.set('width', (args.width - PANEL_BODY_PADDING));
-                    layout.resize();
-                }, this.filepicker, true);
-            }
-            repository_client.fp[client_id].viewbar = new YAHOO.widget.ButtonGroup({
-                id: 'btngroup-'+client_id,
-                name: 'buttons',
-                disabled: true,
-                container: 'repo-viewbar-'+client_id
-            });
-            repository_client.fp[client_id].viewbar.addButtons([btn_icons, btn_listing]);
-            this.print_listing();
-            this.filepicker.render();
-        }
-        this.init_search = function() {
-            var searchbar = document.getElementById('search-div-'+this.client_id);
-            searchbar.innerHTML = '<input id="search-input-'+this.client_id+'" /><button id="search-btn-'+this.client_id+'">'+fp_lang.federatedsearch+'</button>';
-            var search_btn = new YAHOO.util.Element('search-btn-'+this.client_id);
-            search_btn.client_id = this.client_id;
-            var input_keyword = new YAHOO.util.Element('search-input-'+this.client_id);
-            input_keyword.client_id = this.client_id;
-            search_btn.fnSearch = function(e) {
-                var el = new YAHOO.util.Element('search-input-'+this.client_id)
-                var keyword = el.get('value');
-                var r = repository_client.fp[this.client_id];
-                var params = [];
-                params['s'] = keyword;
-                params['env']=r.env;
-                params['accepted_types'] = r.accepted_types;
-                params['sesskey']=moodle_cfg.sesskey;
-                params['ctx_id']=fp_config.contextid;
-                params['client_id']=this.client_id;
-                repository_client.loading(this.client_id, 'load');
-                var trans = YAHOO.util.Connect.asyncRequest('POST',
-                    MOODLE.repository.api+'?action=gsearch', this.search_cb, repository_client.postdata(params));
-            }
-            search_btn.on('contentReady', function() {
-                search_btn.on('click', this.fnSearch, this.input_keyword);
-            });
-            search_btn.search_cb={
-                success: function(o) {
-                    var data = repository_client.parse_json(o.responseText, 'global_search_cb');
-                    var panel = new YAHOO.util.Element('panel-'+data.client_id);
-                    if(!data.list || data.list.length<1){
-                        panel.get('element').innerHTML = fp_lang.noresult;
-                        return;
-                    }
-                    var r = repository_client.fp[data.client_id];
-                    r.view_staus = 0;
-                    r.fs = data.list;
-                    if (data.gsearch) {
-                        // will be used to hide header and footer
-                        r.gsearch = true;
-                    }
-                    if(r.view_staus) {
-                        repository_client.view_as_list(data.client_id, data.list);
-                    } else {
-                        repository_client.view_as_icons(data.client_id, data.list);
-                    }
-                    var el = new YAHOO.util.Element('search-input-'+data.client_id)
-                    el.set('value', '');
-                }
-            }
-            input_keyword.on('contentReady', function() {
-                var scope = document.getElementById('search-input-'+this.client_id);
-                var k1 = new YAHOO.util.KeyListener(scope, {keys:13}, {fn:function(){this.fnSearch()},scope:search_btn, correctScope: true});
-                k1.enable();
-            });
-        }
-        this.print_listing = function() {
-            var container = new YAHOO.util.Element('repo-list-'+this.client_id);
-            container.set('innerHTML', '');
-            container.on('contentReady', function() {
-                this.init_search();
-                for(var i in MOODLE.repository.listing[this.client_id]) {
-                    var repo = MOODLE.repository.listing[this.client_id][i];
-                    var support = false;
-                    if(this.env=='editor' && this.accepted_types != '*'){
-                        if(repo.supported_types!='*'){
-                            for (var j in repo.supported_types){
-                                if(mdl_in_array(repo.supported_types[j], this.accepted_types)){
-                                    support = true;
-                                }
-                            }
-                        }
-                    }else{
-                        support = true;
-                    }
-                    if (repo.type=='draft' && this.env == 'filemanager') {
-                        continue;
-                    }
-                    if(repo.supported_types == '*' || support){
-                        var li = document.createElement('li');
-                        li.id = 'repo-'+this.client_id+'-'+repo.id;
-                        var icon = document.createElement('img');
-                        icon.src = repo.icon;
-                        icon.width = '16';
-                        icon.height = '16';
-                        var link = document.createElement('a');
-                        link.href = '###';
-                        link.id = 'repo-call-'+this.client_id+'-'+repo.id;
-                        link.appendChild(icon);
-                        link.className = 'fp-repo-name';
-                        link.innerHTML += ' '+repo.name;
-                        link.onclick = function() {
-                            var re = new RegExp("repo-call-(\\w+)-(\\d+)", "i");
-                            var result = this.id.match(re);
-                            var client_id = result[1];
-                            var repo_id = result[2];
-                            // high light currect selected repository
-                            for(var cc in MOODLE.repository.listing[client_id]){
-                                var tmp_id = 'repo-call-'+client_id+'-'+ cc;
-                                var el = document.getElementById(tmp_id);
-                                if(el){
-                                    el.style.background = 'transparent';
-                                }
-                            }
-                            this.style.background = '#CCC';
-                            repository_client.req(client_id, repo_id, '');
-                        }
-                        li.appendChild(link);
-                        container.appendChild(li);
-                        repo = null;
-                    }
-                }
-            }, this, true);
-
-        }
-        this.show = function(){
-            this.print_listing();
-            var panel = new YAHOO.util.Element('panel-'+this.filepicker.client_id);
-            panel.get('element').innerHTML = '';
-            this.filepicker.show();
-        }
-        this.hide = function(){
-            this.filepicker.hide();
-        }
-    }
-    // all filepicker instances
-    $.fp = {};
-    return $;
-})();
-// public static method
-// may be called outside yui
-repository_client.req = function(client_id, id, path, page) {
-    repository_client.loading(client_id, 'load');
-    this.fp[client_id].viewbar.set('disabled', false);
-    var r = repository_client.fp[client_id];
-    var params = [];
-    params['p'] = path;
-    params['env']=r.env;
-    params['sesskey']=moodle_cfg.sesskey;
-    params['ctx_id']=fp_config.contextid;
-    params['client_id'] = client_id;
-    params['repo_id']=id;
-    params['itemid'] = repository_client.fp[client_id].itemid;
-    if (!!page) { // convert page to boolean value
-        params['page']=page;
-    }
-    params['accepted_types'] = r.accepted_types;
-    var trans = YAHOO.util.Connect.asyncRequest('POST', MOODLE.repository.api+'?action=list', this.req_cb, this.postdata(params));
-}
-
-repository_client.req_cb = {
-    success: function(o){
-         var data = repository_client.parse_json(o.responseText, 'req_cb');
-         var repo = repository_client.fp[data.client_id];
-         repo.viewbar.set('disabled', false);
-         var panel = new YAHOO.util.Element('panel-'+data.client_id);
-         if(data && data.e) {
-             panel.get('element').innerHTML = '<div class="fp-error">'+data.e+'</div>';
-             return;
-         }
-         // save data
-         repo.fs = data;
-         if(!data) {
-             return;
-         }else if(data.iframe) {
-             repository_client.view_iframe(data.client_id);
-         }else if(data.login) {
-             repo.viewbar.set('disabled', true);
-             repository_client.print_login(data.client_id, data);
-         }else if(data.list) {
-             if(repo.view_status) {
-                 repository_client.view_as_list(data.client_id, data.list);
-             } else {
-                 repository_client.view_as_icons(data.client_id, data.list);
-             }
-         }
-         if (data.msg) {
-             repository_client.print_msg(data.msg, data.client_id);
-         }
-     }
-}
-repository_client.print_msg = function(msg, client_id) {
-     var panel = new YAHOO.util.Element('panel-'+client_id);
-     panel.get('element').innerHTML = '<div class="fp-msg">'+msg+'</div>'+panel.get('element').innerHTML;
-}
-repository_client.view_iframe = function(client_id) {
-    var fs = repository_client.fp[client_id].fs;
-    var panel = new YAHOO.util.Element('panel-'+client_id);
-    panel.get('element').innerHTML = "<iframe frameborder=\"0\" width=\"98%\" height=\"400px\" src=\""+fs.iframe+"\" />";
-}
-repository_client.req_search_results = function(client_id, id, path, page) {
-    repository_client.loading(client_id, 'load');
-    this.fp[client_id].viewbar.set('disabled', false);
-    var r = repository_client.fp[client_id];
-    var params = [];
-    params['p'] = path;
-    params['env']=r.env;
-    params['sesskey']=moodle_cfg.sesskey;
-    params['ctx_id']=fp_config.contextid;
-    params['client_id'] = client_id;
-    params['search_paging']='true';
-    params['repo_id']=id;
-    if (!!page) { // convert page to boolean value
-        params['page']=page;
-    }
-    params['accepted_types'] = r.accepted_types;
-    var trans = YAHOO.util.Connect.asyncRequest('POST', MOODLE.repository.api+'?action=search', this.req_cb, this.postdata(params));
-}
-
-repository_client.print_login = function(id, data) {
-    var login = data.login;
-    var panel = new YAHOO.util.Element('panel-'+id);
-    var action = 'login';
-    if (data['login_btn_action']) {
-        action=data['login_btn_action'];
-    }
-    var str = '<div class="fp-login-form" onkeypress="repository_client.login_keypress(event,\''+action+'\')">';
-    var has_pop = false;
-    this.fp[id].login = login;
-    str +='<table width="100%">';
-    for(var k in login) {
-        str +='<tr>';
-        if(login[k].type=='popup') {
-            str += '<td colspan="2"><p class="fp-popup">'+fp_lang.popup+'</p>';
-            str += '<p class="fp-popup"><button onclick="repository_client.popup(\''+id+'\', \''+login[k].url+'\')">'+fp_lang.login+'</button>';
-            str += '</p></td>';
-            has_pop = true;
-        }else if(login[k].type=='textarea') {
-            str += '<td colspan="2"><p><textarea id="'+login[k].id+'" name="'+login[k].name+'"></textarea></p></td>';
-        }else if(login[k].type=='select') {
-            str += '<td align="right"><label>'+login[k].label+':</label></td><td align="left"><select id="'+login[k].id+'" name="'+login[k].name+'">';
-            for (i in login[k].options) {
-                str += '<option value="'+login[k].options[i].value+'">'+login[k].options[i].label+'</option>';
-            }
-            str += '</select></td>';
-        }else{
-            var label_id = '';
-            var field_id = '';
-            var field_value = '';
-            if(login[k].id) {
-                label_id = ' for="'+login[k].id+'"';
-                field_id = ' id="'+login[k].id+'"';
-            }
-            if (login[k].label) {
-                str += '<td align="right" width="30%" valign="center"><label'+label_id+'>'+login[k].label+'</label> </td>';
-            } else {
-                str += '<td width="30%"></td>';
-            }
-            if(login[k].value) {
-                field_value = ' value="'+login[k].value+'"';
-            }
-            if(login[k].type=='radio'){
-                var list = login[k].value.split('|');
-                var labels = login[k].value_label.split('|');
-                str += '<td align="left">';
-                for(var item in list) {
-                    str +='<input type="'+login[k].type+'"'+' name="'+login[k].name+'"'+
-                        field_id+' value="'+list[item]+'" />'+labels[item]+'<br />';
-                }
-                str += '</td>';
-            }else{
-                str += '<td align="left"><input type="'+login[k].type+'"'+' name="'+login[k].name+'"'+field_value+' '+field_id+' /></td>';
-            }
-        }
-        str +='</tr>';
-    }
-    str +='</table>';
-    var btn_label = data['login_btn_label']?data['login_btn_label']:fp_lang.submit;
-    if (data['login_btn_action'] == 'search') {
-        str += '<p><input type="button" onclick="repository_client.search(\''+id+'\', \''+data.repo_id+'\')" value="'+btn_label+'" /></p>';
-    } else if(data['login_btn_action'] == 'download') {
-        str += '<p><input type="button" onclick="repository_client.download(\''+id+'\', \''+data.repo_id+'\')" value="'+btn_label+'" /></p>';
-    } else {
-        if(!has_pop) {
-            str += '<p><input type="button" onclick="repository_client.login(\''+id+'\', \''+data.repo_id+'\')" value="'+btn_label+'" /></p>';
-        }
-    }
-    str += '</div>';
-    try {
-        panel.get('element').innerHTML = str;
-    } catch(e) {
-        alert(e.toString()+fp_lang.xhtml);
-    }
-    cached_id=id;
-    cached_repo_id=data.repo_id;
-}
-repository_client.login = function(id, repo_id) {
-    var params = [];
-    var data = this.fp[id].login;
-    for (var k in data) {
-        if(data[k].type!='popup') {
-            var el = document.getElementsByName(data[k].name)[0];
-            params[data[k].name] = '';
-            if(el.type == 'checkbox') {
-                params[data[k].name] = el.checked;
-            } else {
-                params[data[k].name] = el.value;
-            }
-        }
-    }
-    params['env'] = this.fp[id].env;
-    params['repo_id'] = repo_id;
-    params['client_id'] = id;
-    params['ctx_id'] = fp_config.contextid;
-    params['sesskey'] = moodle_cfg.sesskey;
-    params['accepted_types'] = this.fp[id].accepted_types;
-    this.loading(id, 'load');
-    var trans = YAHOO.util.Connect.asyncRequest('POST',
-            MOODLE.repository.api+'?action=sign', this.req_cb, this.postdata(params));
-}
-repository_client.login_keypress = function(evt,action) {
-    evt = (evt) ? evt : ((window.event) ? window.event : "")
-    var key = evt.keyCode?evt.keyCode:evt.which;
-    if(key == 13 || key == 10){
-        if(action=='search'){
-            repository_client.search(cached_id, cached_repo_id);
-        } else if (action=='download') {
-            repository_client.download(cached_id, cached_repo_id);
-        } else {
-            repository_client.login(cached_id, cached_repo_id);
-        }
-    }
-}
-repository_client.search = function(id, repo_id) {
-    var params = [];
-    var data = this.fp[id].login;
-    for (var k in data) {
-        if(data[k].type!='popup') {
-            var el = document.getElementsByName(data[k].name)[0];
-            params[data[k].name] = '';
-            if(el.type == 'checkbox') {
-                params[data[k].name] = el.checked;
-            } else if(el.type == 'radio') {
-                var tmp = document.getElementsByName(data[k].name);
-                for(var i in tmp) {
-                    if (tmp[i].checked) {
-                        params[data[k].name] = tmp[i].value;
-                    }
-                }
-            } else {
-                params[data[k].name] = el.value;
-            }
-        }
-    }
-    params['env'] = this.fp[id].env;
-    params['repo_id'] = repo_id;
-    params['client_id'] = id;
-    params['ctx_id'] = fp_config.contextid;
-    params['sesskey'] = moodle_cfg.sesskey;
-    params['accepted_types'] = this.fp[id].accepted_types;
-    this.loading(id, 'load');
-    var trans = YAHOO.util.Connect.asyncRequest('POST',
-            MOODLE.repository.api+'?action=search', this.req_cb, this.postdata(params));
-}
-repository_client.loading = function(id, type, name) {
-    var panel = new YAHOO.util.Element('panel-'+id);
-    panel.get('element').innerHTML = '';
-    var str = '<div style="text-align:center">';
-    if(type=='load') {
-        str += '<img src="'+fp_config.icons.loading+'" />';
-        str += '<p>'+fp_lang.loading+'</p>';
-    }else{
-        str += '<img src="'+fp_config.icons.progressbar+'" />';
-        str += '<p>'+fp_lang.copying+' <strong>'+name+'</strong></p>';
-    }
-    str += '</div>';
-    try {
-        panel.get('element').innerHTML = str;
-    } catch(e) {
-        alert(e.toString());
-    }
-}
-repository_client.view_as_list = function(client_id, data) {
-    if (typeof client_id == 'object') {
-        // click button
-        client_id = data;
-        list = repository_client.fp[client_id].fs.list;
-    } else if(!data) {
-        // from viewfiles
-        list = repository_client.fp[client_id].fs.list;
-    }else{
-        // from callback
-        list = data;
-    }
-    var panel = new YAHOO.util.Element('panel-'+client_id);
-    var fp = repository_client.fp[client_id];
-    fp.view_status = 1;
-    fp.viewbar.check(1);
-    repository_client.print_header(client_id);
-    panel.get('element').innerHTML += '<div id="treediv-'+client_id+'"></div>';
-    var tree = new YAHOO.widget.TreeView('treediv-'+client_id);
-    tree.dynload = function (node, fnLoadComplete) {
-        var callback = {
-            success: function(o) {
-                 var json = repository_client.parse_json(o.responseText, 'dynload');
-                 for(k in json.list) {
-                     repository_client.buildtree(json.client_id, json.list[k], node);
-                 }
-                 o.argument.fnLoadComplete();
-            },
-            failure:function(oResponse) {
-                alert(fp_lang.error+' - |dynload| -');
-                oResponse.argument.fnLoadComplete();
-            },
-            argument:{"node":node, "fnLoadComplete": fnLoadComplete}
-        }
-        var fp = repository_client.fp[node.client_id];
-        var params = [];
-        params['p']=node.path;
-        params['env']=fp.env;
-        params['sesskey']=moodle_cfg.sesskey;
-        params['ctx_id']=fp_config.contextid;
-        params['repo_id']=fp.fs.repo_id;
-        params['client_id']=node.client_id;
-        params['accepted_types']=fp.accepted_types;
-        var trans = YAHOO.util.Connect.asyncRequest('POST',
-                MOODLE.repository.api+'?action=list',callback,repository_client.postdata(params));
-    }
-    tree.dynload.client_id = client_id;
-    if(fp.fs.dynload) {
-        tree.setDynamicLoad(tree.dynload, 1);
-    } else {
-    }
-    for(k in list) {
-        repository_client.buildtree(client_id, list[k], tree.getRoot());
-    }
-    tree.draw();
-    tree.subscribe('clickEvent', function(e){
-        if(e.node.isLeaf){
-            repository_client.select_file(e.node.data.filename, e.node.data.value, e.node.data.icon, client_id, e.node.repo_id);
-        }
-    });
-    repository_client.print_footer(client_id);
-}
-repository_client.buildtree = function(client_id, node, level) {
-    var fs = repository_client.fp[client_id].fs;
-    if(node.children) {
-        node.title = '<i><u>'+node.title+'</u></i>';
-    }
-    var info = {
-        label:node.title,
-        title:fp_lang.date+' '+node.date+fp_lang.size+' '+node.size,
-        filename:node.title,
-        value:node.source,
-        icon:node.thumbnail,
-        path:node.path
-    };
-    var tmpNode = new YAHOO.widget.TextNode(info, level, false);
-    var tooltip = new YAHOO.widget.Tooltip(tmpNode.labelElId, {
-        context:tmpNode.labelElId, text:info.title});
-    if(node.repo_id) {
-        tmpNode.repo_id=node.repo_id;
-    }else{
-        tmpNode.repo_id=fs.repo_id;
-    }
-    if(node.children) {
-        if(node.expanded) {
-            tmpNode.expand();
-        }
-        tmpNode.isLeaf = false;
-        tmpNode.client_id = client_id;
-        if (node.path) {
-            tmpNode.path = node.path;
-        } else {
-            tmpNode.path = '';
-        }
-        for(var c in node.children) {
-            this.buildtree(client_id, node.children[c], tmpNode);
-        }
-    } else {
-        tmpNode.isLeaf = true;
-    }
-}
-repository_client.select_file = function(oldname, url, icon, client_id, repo_id) {
-    var fp = repository_client.fp[client_id];
-    if (repository_client.files[client_id] == undefined) {
-        repository_client.files[client_id] = 0;
-    }
-    if (repository_client.files[client_id] >= repository_client.fp[client_id].maxfiles &&
-            repository_client.fp[client_id].maxfiles != -1)
-    {
-        alert('Only '+repository_client.fp[client_id].maxfiles+' files are allowed!');
-        return false;
-    }
-    var thumbnail = document.getElementById('fp-grid-panel-'+client_id);
-    if(thumbnail){
-        thumbnail.style.display = 'none';
-    }
-    var header = document.getElementById('fp-header-'+client_id);
-    header.style.display = 'none';
-    var footer = document.getElementById('fp-footer-'+client_id);
-    footer.style.display = 'none';
-    var pathbar = document.getElementById('path-'+client_id);
-    if(pathbar){
-        pathbar.style.display = 'none';
-    }
-    var panel = new YAHOO.util.Element('panel-'+client_id);
-    var html = '<div class="fp-rename-form">';
-    html += '<p><img src="'+icon+'" /></p>';
-    html += '<p><label for="newname-'+client_id+'">'+fp_lang.saveas+'</label>';
-    html += '<input type="text" id="newname-'+client_id+'" value="" /></p>';
-
-    var le_checked = '';
-    var le_style = '';
-    if (MOODLE.repository.listing[client_id][repo_id].return_types == 1) {
-        // support external links only
-        le_checked = 'checked';
-        le_style = ' style="display:none;"';
-    } else if(MOODLE.repository.listing[client_id][repo_id].return_types == 2) {
-        // support internal files only
-        le_style = ' style="display:none;"';
-    }
-    if (fp_config.externallink && fp.env == 'editor') {
-        html += '<p'+le_style+'><input type="checkbox" id="external_link-'+client_id+'" value="" '+le_checked+' />'+fp_lang.linkexternal+'</p>';
-    }
-    html += '<p><input type="hidden" id="fileurl-'+client_id+'" value="'+url+'" />';
-    html += '<input type="button" onclick="repository_client.download(\''+client_id+'\', \''+repo_id+'\')" value="'+fp_lang.downbtn+'" />';
-    html += '<input type="button" onclick="repository_client.viewfiles(\''+client_id+'\')" value="'+fp_lang.cancel+'" /></p>';
-    html += '</div>';
-    panel.get('element').innerHTML += html;
-    document.getElementById('newname-'+client_id).value = oldname;
-    var tree = document.getElementById('treediv-'+client_id);
-    if(tree){
-        tree.style.display = 'none';
-    }
-}
-repository_client.paging = function(client_id, id) {
-    var str = '';
-    this.fp[client_id].view_staus = 0;
-    var fs = this.fp[client_id].fs;
-    if(fs.pages) {
-        str += '<div class="fp-paging" id="paging-'+id+'-'+client_id+'">';
-        if(!fs.search_result){
-            var action = 'req';
-        } else {
-            var action = 'req_search_results';
-        }
-        // print the first element anyway
-        str += this.get_page_btn(client_id, action, 1)+'1</a> ';
-
-        var span = 5;
-        var ex = (span-1)/2;
-
-        if (fs.page+ex>=fs.pages) {
-            var max = fs.pages;
-        } else {
-            if (fs.page<span) {
-                var max = span;
-            } else {
-                var max = fs.page+ex;
-            }
-        }
-
-        // won't display upper boundary
-        if (fs.page >= span) {
-            str += ' ... ';
-            for(var i=fs.page-ex; i<max; i++) {
-                str += this.get_page_btn(client_id, action, i);
-                str += String(i);
-                str += '</a> ';
-            }
-        } else {
-            // this very first elements
-            for(var i = 2; i < max; i++) {
-                str += this.get_page_btn(client_id, action, i);
-                str += String(i);
-                str += '</a> ';
-            }
-        }
-
-        // won't display upper boundary
-        if (max==fs.pages) {
-            str += this.get_page_btn(client_id, action, fs.pages)+fs.pages+'</a>';
-        } else {
-            str += repository_client.get_page_btn(client_id, action, max)+max+'</a>';
-            str += ' ... '+repository_client.get_page_btn(client_id, action, fs.pages)+fs.pages+'</a>';
-        }
-        str += '</div>';
-    }
-    return str;
-}
-repository_client.get_page_btn = function(client_id, type, page) {
-    var fs = this.fp[client_id].fs;
-    var css = '';
-    if (page == fs.page) {
-        css = 'class="cur_page"';
-    }
-    str = '<a '+css+' onclick="repository_client.'+type+'(\''+client_id+'\','+fs.repo_id+', '+page+', '+page+')" href="###">';
-    return str;
-}
-repository_client.path = function(client_id) {
-    var fs = this.fp[client_id].fs;
-    // if this is listing view
-    if(this.fp[client_id].view_status == 1) {
-        return;
-    }
-    var panel = new YAHOO.util.Element('panel-'+client_id);
-    var p = fs.path;
-    if(p && p.length!=0) {
-        var oDiv = document.createElement('DIV');
-        oDiv.id = "path-"+client_id;
-        oDiv.className = "fp-pathbar";
-        panel.get('element').appendChild(oDiv);
-        for(var i = 0; i < fs.path.length; i++) {
-            var link = document.createElement('A');
-            link.href = "###";
-            link.innerHTML = fs.path[i].name;
-            link.id = 'path-'+client_id+'-'+fs.repo_id;
-            link.path=fs.path[i].path;
-            link.onclick = function() {
-                var re = new RegExp("path-(\\w+)-(\\d+)", "i");
-                var result = this.id.match(re);
-                var client_id = result[1];
-                var repo_id = result[2];
-                repository_client.req(client_id, repo_id, this.path);
-            }
-            var sep = document.createElement('SPAN');
-            sep.innerHTML = '/';
-            oDiv.appendChild(link);
-            oDiv.appendChild(sep);
-        }
-    }
-}
-repository_client.print_header = function(client_id) {
-    var panel = new YAHOO.util.Element('panel-'+client_id);
-    var str = '<div id="fp-header-'+client_id+'">';
-    str += '<div class="fp-toolbar" id="repo-tb-'+client_id+'"></div>';
-    if(this.fp[client_id].fs.pages < 8){
-        str += this.paging(client_id, 'header');
-    }
-    str += '</div>';
-    panel.set('innerHTML', str);
-    this.path(client_id);
-}
-repository_client.view_as_icons = function(client_id, data) {
-    var list = null;
-    if (typeof client_id == 'object') {
-        // click button
-        client_id = data;
-        list = repository_client.fp[client_id].fs.list;
-    } else if(!data) {
-        // from viewfiles
-        list = repository_client.fp[client_id].fs.list;
-    }else{
-        // from callback
-        list = data;
-    }
-    var fp = repository_client.fp[client_id];
-    fp.view_status = 0;
-    fp.viewbar.check(0);
-    var container = document.getElementById('panel-'+client_id);
-    var panel = document.createElement('DIV');
-    panel.id = 'fp-grid-panel-'+client_id;
-    repository_client.print_header(client_id);
-    var count = 0;
-    for(k in list) {
-        // the container
-        var el = document.createElement('div');
-        el.className='fp-grid';
-        // the file name
-        var title = document.createElement('div');
-        title.id = 'grid-title-'+client_id+'-'+String(count);
-        title.className = 'label';
-        if (list[k].shorttitle) {
-            list[k].title = list[k].shorttitle;
-        }
-        title.innerHTML += '<a href="###"><span>'+list[k].title+"</span></a>";
-        if(list[k].thumbnail_width){
-            el.style.width = list[k].thumbnail_width+'px';
-            title.style.width = (list[k].thumbnail_width-10)+'px';
-        } else {
-            el.style.width = title.style.width = '80px';
-        }
-        var frame = document.createElement('DIV');
-        frame.style.textAlign='center';
-        if(list[k].thumbnail_height){
-            frame.style.height = list[k].thumbnail_height+'px';
-        }
-        var img = document.createElement('img');
-        img.src = list[k].thumbnail;
-        if(list[k].thumbnail_alt) {
-            img.alt = list[k].thumbnail_alt;
-        }
-        if(list[k].thumbnail_title) {
-            img.title = list[k].thumbnail_title;
-        }
-        var link = document.createElement('A');
-        link.href='###';
-        link.id = 'img-id-'+client_id+'-'+String(count);
-        if(list[k].url) {
-            el.innerHTML += '<p><a target="_blank" href="'+list[k].url+'">'+fp_lang.preview+'</a></p>';
-        }
-        link.appendChild(img);
-        frame.appendChild(link);
-        el.appendChild(frame);
-        if (fp.fs.draftfiles && !list[k].children) {
-            var delbtn = document.createElement('A');
-            delbtn.href = '###';
-            delbtn.innerHTML = "[X]";
-            delbtn.id = 'del-id-'+client_id+'-'+String(count);
-            el.appendChild(delbtn);
-            delbtn.itemid=fp.itemid;
-            delbtn.client_id=client_id;
-            delbtn.title=list[k].title;
-            delbtn.repo_id=fp.fs.repo_id;
-            delbtn.onclick = function() {
-                if (confirm('Sure?')) {
-                    var params = [];
-                    params['client_id'] = this.client_id;
-                    params['itemid'] = this.itemid;
-                    params['title'] = this.title;
-                    var trans = YAHOO.util.Connect.asyncRequest('POST',
-                        MOODLE.repository.api+'?action=delete',
-                        this,
-                        repository_client.postdata(params)
-                        );
-                }
-            }
-            delbtn.success = function(o) {
-                repository_client.req(o.responseText, this.repo_id);
-            }
-        }
-        el.appendChild(title);
-        panel.appendChild(el);
-        if(list[k].children) {
-            var folder = new YAHOO.util.Element(link.id);
-            folder.path = list[k].path;
-            var el_title = new YAHOO.util.Element(title.id);
-            folder.fs = list[k].children;
-            folder.on('contentReady', function() {
-                this.on('click', function() {
-                    if(fp.fs.dynload) {
-                        var fs = repository_client.fp[client_id].fs;
-                        var params = [];
-                        params['p'] = this.path;
-                        params['env'] = repository_client.fp[client_id].env;
-                        params['repo_id'] = fs.repo_id;
-                        params['ctx_id'] = fp_config.contextid;
-                        params['sesskey']= moodle_cfg.sesskey;
-                        params['accepted_types'] = repository_client.fp[client_id].accepted_types;
-                        params['client_id'] = client_id;
-                        repository_client.loading(client_id, 'load');
-                        var trans = YAHOO.util.Connect.asyncRequest('POST',
-                                MOODLE.repository.api+'?action=list', repository_client.req_cb, repository_client.postdata(params));
-                    }else{
-                        repository_client.view_as_icons(client_id, this.fs);
-                    }
-                });
-            });
-            el_title.on('contentReady', function() {
-                this.on('click', function(){
-                    this.folder.fireEvent('click');
-                });
-            });
-            el_title.folder = folder;
-        } else {
-            var el_title = new YAHOO.util.Element(title.id);
-            var file = new YAHOO.util.Element(link.id);
-            el_title.filename = file.filename = list[k].title;
-            el_title.value = file.value = list[k].source;
-            el_title.icon = file.icon  = list[k].thumbnail;
-            if(fp.fs.repo_id) {
-                el_title.repo_id = file.repo_id = fp.fs.repo_id;
-            }else if(list[k].repo_id) {
-                el_title.repo_id = file.repo_id = list[k].repo_id;
-            }else{
-                el_title.repo_id = file.repo_id = '';
-            }
-            file.on('contentReady', function() {
-                this.on('click', function() {
-                    repository_client.select_file(this.filename, this.value, this.icon, client_id, this.repo_id);
-                });
-            });
-            el_title.on('contentReady', function() {
-                this.on('click', function() {
-                    repository_client.select_file(this.filename, this.value, this.icon, client_id, this.repo_id);
-                });
-            });
-        }
-        count++;
-    }
-    if (list.length == 0 && !fp.fs.upload) {
-        panel.innerHTML = '<div class="fp-error">'+fp_lang.emptylist+'</div>';
-    }
-    container.appendChild(panel);
-    repository_client.print_footer(client_id);
-}
-repository_client.print_footer = function(client_id) {
-    var fs = this.fp[client_id].fs;
-    var panel = document.getElementById('panel-'+client_id);
-    var footer = document.createElement('DIV');
-    footer.id = 'fp-footer-'+client_id;
-    footer.innerHTML += this.create_upload_form(client_id);
-    footer.innerHTML += this.paging(client_id, 'footer');
-    panel.appendChild(footer);
-    // add repository manage buttons here
-    var oDiv = document.getElementById('repo-tb-'+client_id);
-    if(this.fp[client_id].gsearch) {
-        // reset
-        this.fp[client_id].gsearch='';
-        return;
-    }
-    if(!fs.nosearch) {
-        var img = document.createElement('img');
-        img.src = fp_config.icons.search;
-        var search = document.createElement('A');
-        search.href = '###';
-        search.appendChild(document.createTextNode(fp_lang.search));
-        oDiv.appendChild(img);
-        oDiv.appendChild(search);
-        search.onclick = function() {
-            repository_client.search_form(client_id, fs.repo_id);
-        }
-    }
-    // weather we use cache for this instance, this button will reload listing anyway
-    if(!fs.norefresh) {
-        var img = document.createElement('img');
-        img.src = fp_config.icons.refresh;
-        var ccache = document.createElement('A');
-        ccache.href = "###";
-        ccache.appendChild(document.createTextNode(fp_lang.refresh));
-        oDiv.appendChild(img);
-        oDiv.appendChild(ccache);
-        ccache.onclick = function() {
-            var params = [];
-            params['env']=fs.env;
-            params['sesskey']=moodle_cfg.sesskey;
-            params['ctx_id']=fp_config.contextid;
-            params['repo_id']=fs.repo_id;
-            params['client_id']=client_id;
-            repository_client.loading(client_id, 'load');
-            var trans = YAHOO.util.Connect.asyncRequest('POST',
-                    MOODLE.repository.api+'?action=ccache', repository_client.req_cb, repository_client.postdata(params));
-        }
-    }
-    if(fs.manage) {
-        var mgr = document.createElement('A');
-        mgr.innerHTML = '<img src="'+fp_config.icons.setting+'" /> '+fp_lang.mgr;
-        mgr.href = fs.manage;
-        mgr.target = "_blank";
-        oDiv.appendChild(mgr);
-    }
-    if(!fs.nologin) {
-        var logout = document.createElement('A');
-        logout.href = '###';
-        logout.innerHTML = '<img src="'+fp_config.icons.logout+'" /> '+fp_lang.logout;
-        oDiv.appendChild(logout);
-        logout.onclick = function() {
-            repository_client.logout(client_id, fs.repo_id);
-        }
-    }
-    if(fs.help) {
-        var help = document.createElement('A');
-        help.href = fs.help;
-        help.target = "_blank";
-        help.innerHTML = '<img src="'+fp_config.icons.help+'" /> '+fp_lang['help'];
-        oDiv.appendChild(help);
-    }
-}
-
-repository_client.postdata = function(obj) {
-    var str = '';
-    for(k in obj) {
-        if(obj[k] instanceof Array) {
-            for(i in obj[k]) {
-                str += (encodeURIComponent(k) +'[]='+encodeURIComponent(obj[k][i]));
-                str += '&';
-            }
-        } else {
-            str += encodeURIComponent(k) +'='+encodeURIComponent(obj[k]);
-            str += '&';
-        }
-    }
-    return str;
-}
-
-repository_client.popup = function(client_id, url) {
-    window.open(url,'repo_auth', 'location=0,status=0,scrollbars=0,width=500,height=300');
-    MOODLE.repository.cache.client_id = client_id;
-    return true;
-}
-function repository_callback(id) {
-    repository_client.req(MOODLE.repository.cache.client_id, id, '');
-}
-repository_client.logout = function(client_id, repo_id) {
-    var params = [];
-    params['repo_id'] = repo_id;
-    params['client_id'] = client_id;
-    var trans = YAHOO.util.Connect.asyncRequest('POST', MOODLE.repository.api+'?action=logout',
-            repository_client.req_cb, repository_client.postdata(params));
-}
-repository_client.download = function(client_id, repo_id) {
-    var params = [];
-    var fp = repository_client.fp[client_id];
-    var title = document.getElementById('newname-'+client_id).value;
-    new_filename = title;
-    var file = document.getElementById('fileurl-'+client_id).value;
-    if (fp.env == 'editor') {
-        var link_external = document.getElementById('external_link-'+client_id).checked;
-        if (link_external) {
-            params['link_external'] = 'yes';
-        }
-    } if (fp.env == 'url') {
-        params['link_external'] = 'yes';
-    }
-    repository_client.loading(client_id, 'download', title);
-    if(fp.itemid){
-        params['itemid']=fp.itemid;
-    }
-    params['env']=fp.env;
-    params['file']=file;
-    params['savepath']=fp.savepath;
-    params['title']=title;
-    params['sesskey']=moodle_cfg.sesskey;
-    params['ctx_id']=fp_config.contextid;
-    params['repo_id']=repo_id;
-    params['client_id']=client_id;
-    params['maxbytes']=fp.maxbytes;
-    var trans = YAHOO.util.Connect.asyncRequest('POST',
-            MOODLE.repository.api+'?action=download',
-            repository_client.download_cb,
-            repository_client.postdata(params));
-}
-repository_client.download_cb = {
-    success: function(o) {
-         var data = repository_client.parse_json(o.responseText, 'download_cb');
-         var panel = new YAHOO.util.Element('panel-'+data.client_id);
-         if(data && data.e) {
-             panel.get('element').innerHTML = data.e;
-             return;
-         }
-         if(repository_client.files[data.client_id]==undefined) {
-             repository_client.files[data.client_id] = 0;
-         } else {
-             repository_client.files[data.client_id]++;
-         }
-         repository_client.end(data.client_id, data);
-    }
-}
-repository_client.end = function(client_id, obj) {
-    var fp = repository_client.fp[client_id];
-    if (repository_client.files[client_id] == undefined) {
-        repository_client.files[client_id] = 0;
-    }
-    if(fp.env=='filepicker') {
-        if (fp.target)
-            fp.target.value = obj['id'];
-    }else if(fp.env=='editor'){
-        if (obj['type'] == 'link') {
-            fp.target.value = obj['url']+'#'+new_filename;
-        } else {
-            fp.target.value = obj['url'];
-        }
-        fp.target.onchange();
-    }else if(fp.env=='url') {
-        fp.target.value = obj['url'];
-    }
-    obj.filepath = fp.savepath;
-    obj.maxfileslimit = (fp.maxfiles!=-1 && repository_client.files[client_id]>=fp.maxfiles);
-    fp.formcallback(obj);
-    fp.hide();
-    repository_client.viewfiles(client_id);
-}
-repository_client.viewfiles = function(client_id) {
-     var repo = repository_client.fp[client_id];
-    if(repo.view_status) {
-        repository_client.view_as_list(client_id);
-    } else {
-        repository_client.view_as_icons(client_id);
-    }
-}
-repository_client.create_upload_form = function(client_id) {
-    var str = '';
-    var fs = repository_client.fp[client_id].fs;
-    if(fs.upload) {
-        var id = fs.upload.id+'_'+client_id;
-        str += '<div id="'+id+'_div" class="fp-upload-form">';
-        str += '<form id="'+id+'" onsubmit="return false">';
-        str += '<label for="'+id+'_file">'+fs.upload.label+': </label>';
-        str += '<input type="file" id="'+id+'_file" name="repo_upload_file" />';
-        str += '<div class="fp-upload-btn"><a href="###" onclick="return repository_client.upload(\''+client_id+'\');">'+fp_lang.upload+'</a></div>';
-        str += '</form>';
-        str += '</div>';
-    }
-    return str;
-}
-repository_client.upload = function(client_id) {
-    var fp = repository_client.fp[client_id];
-    var u = repository_client.fp[client_id].fs;
-    var id = u.upload.id+'_'+client_id;
-    var aform = document.getElementById(id);
-    var parent = document.getElementById(id+'_div');
-    var d = document.getElementById(id+'_file');
-    if(d.value!='' && d.value!=null) {
-        var container = document.createElement('DIV');
-        container.id = id+'_loading';
-        container.style.textAlign='center';
-        var img = document.createElement('IMG');
-        img.src = fp_config.icons.progressbar;
-        var para = document.createElement('p');
-        para.innerHTML = fp_lang.uploading;
-        container.appendChild(para);
-        container.appendChild(img);
-        parent.appendChild(container);
-        YAHOO.util.Connect.setForm(aform, true, true);
-
-        var trans = YAHOO.util.Connect.asyncRequest('POST',
-                MOODLE.repository.api+'?action=upload&itemid='+fp.itemid
-                    +'&sesskey='+moodle_cfg.sesskey
-                    +'&ctx_id='+fp_config.contextid
-                    +'&savepath='+fp.savepath
-                    +'&repo_id='+u.repo_id
-                    +'&client_id='+client_id,
-                repository_client.upload_cb);
-    }else{
-        alert(fp_lang.filenotnull);
-    }
-}
-repository_client.upload_cb = {
-upload: function(o) {
-        var ret = repository_client.parse_json(o.responseText, 'upload');
-        if(ret && ret.e) {
-            var panel = new YAHOO.util.Element('panel-'+ret.client_id);
-            panel.get('element').innerHTML = ret.e;
-            return;
-        }
-        if(ret) {
-            repository_client.end(ret.client_id, ret);
-        }
-    }
-}
-repository_client.parse_json = function(txt, source) {
-    try {
-        var ret = YAHOO.lang.JSON.parse(txt);
-    } catch(e) {
-        alert(fp_lang.invalidjson+' - |'+source+'| -'+stripHTML(txt));
-    }
-    return ret;
-}
-repository_client.search_form = function(client_id, id) {
-    var fp = repository_client.fp[client_id];
-    var params = [];
-    params['env']=fp.env;
-    params['sesskey']=moodle_cfg.sesskey;
-    params['client_id']=client_id;
-    params['ctx_id']=fp_config.contextid;
-    params['repo_id']=id;
-    var trans = YAHOO.util.Connect.asyncRequest('POST',
-            MOODLE.repository.api+'?action=searchform',
-            repository_client.search_form_cb,
-            repository_client.postdata(params));
-}
-repository_client.search_form_cb = {
-success: function(o) {
-     var data = repository_client.parse_json(o.responseText, 'search_form_cb');
-     var el = document.getElementById('fp-search-dlg');
-     var fp = repository_client.fp[data.client_id];
-     if(el) {
-         el.innerHTML = '';
-         el.parentNode.removeChild(el);
-     }
-     var el = document.createElement('DIV');
-     el.id = 'fp-search-dlg';
-     var dlg_title = document.createElement('DIV');
-     dlg_title.className = 'hd';
-     dlg_title.innerHTML = fp_lang.searching+"\"" + MOODLE.repository.listing[data.client_id][fp.fs.repo_id].name + '"';
-     var dlg_body = document.createElement('DIV');
-     dlg_body.className = 'bd';
-     var sform = document.createElement('FORM');
-     sform.method = 'POST';
-     sform.id = "fp-search-form";
-     sform.action = MOODLE.repository.api+'?action=search';
-     sform.innerHTML = data['form'];
-     dlg_body.appendChild(sform);
-     el.appendChild(dlg_title);
-     el.appendChild(dlg_body);
-     document.body.appendChild(el);
-     var dlg_handler = function() {
-         var client_id=dlg_handler.client_id;
-         repository_client.fp[client_id].viewbar.set('disabled', false);
-         repository_client.loading(client_id, 'load');
-         YAHOO.util.Connect.setForm('fp-search-form', false, false);
-         this.cancel();
-         var url = MOODLE.repository.api+'?action=search&env='+dlg_handler.env
-                +'&client_id='+client_id;
-         var trans = YAHOO.util.Connect.asyncRequest('POST', url,
-             repository_client.req_cb);
-     }
-     dlg_handler.client_id = data.client_id;
-     dlg_handler.env = fp.env;
-     var dlg = new YAHOO.widget.Dialog("fp-search-dlg",{
-        postmethod: 'async',
-        draggable: true,
-        width : "30em",
-        fixedcenter : true,
-        zindex: 766667,
-        visible : false,
-        constraintoviewport : true,
-        buttons : [
-        {
-            text:fp_lang.submit,
-            handler: dlg_handler,
-            isDefault:true
-        },
-        {text:fp_lang.cancel,handler:function(){this.destroy()}}
-        ]
-    });
-    dlg.render();
-    dlg.show();
-}
-}
-repository_client.files = {};
-var mdl_in_array = function(el, arr) {
-    for(var i = 0, l = arr.length; i < l; i++) {
-        if(arr[i] == el) {
-            return true;
-        }
-    }
-    return false;
-}
-
-// will be called by filemanager or editor to launch file picker
-function open_filepicker(id, params) {
-    var r = repository_client.fp[id];
-    if(!r) {
-        // passing parameters
-        r = new repository_client();
-        r.env = params.env;
-        r.target = params.target;
-        if(params.itemid){
-            r.itemid = params.itemid;
-        } else if(tinyMCE && id2itemid[tinyMCE.selectedInstance.editorId]){
-            r.itemid = id2itemid[tinyMCE.selectedInstance.editorId];
-        }
-        // setup callback function
-        if(params.callback) {
-            r.formcallback = params.callback;
-        } else {
-            r.formcallback = function() {};
-        }
-        // write back
-        repository_client.fp[id] = r;
-        // create file picker (html elements and events)
-        r.create_filepicker(id);
-    } else {
-        r.target = params.target;
-        r.show();
-    }
-    if (params.savepath) {
-        r.savepath = params.savepath;
-    } else {
-        r.savepath = params.savepath = '/';
-    }
-    if(params.filetype) {
-        if(params.filetype == 'image') {
-            r.accepted_types = MOODLE.repository.extensions.image;
-        } else if(params.filetype == 'video' || params.filetype== 'media') {
-            r.accepted_types = MOODLE.repository.extensions.media;
-        } else if(params.filetype == 'file') {
-            r.accepted_types = '*';
-        }
-    } else {
-        r.accepted_types = '*';
-    }
-    if (!params.maxfiles) {
-        // unlimited
-        params.maxfiles = -1;
-    }
-    if (!params.maxbytes) {
-        // unlimited
-        params.maxbytes = -1;
-    }
-    r.maxfiles = params.maxfiles;
-    r.maxbytes = params.maxbytes;
-    return r;
-}
-
-function id2_add_clientid(id, clientid) {
-    id2clientid[id] = clientid;
-}
-
-function id2_add_itemid(id, drafitemid) {
-    id2itemid[id] = drafitemid;
-}
diff --git a/repository/repository_ajax.php b/repository/repository_ajax.php
index f8da83146bd..9794366f267 100755
--- a/repository/repository_ajax.php
+++ b/repository/repository_ajax.php
@@ -29,10 +29,12 @@
     require_once('../config.php');
     require_once('../lib/filelib.php');
     require_once('lib.php');
+
     require_login();
 
 /// Parameters
     $action    = optional_param('action', '', PARAM_ALPHA);
+    $repo_id   = optional_param('repo_id', 1, PARAM_INT);           // repository ID
     $callback  = optional_param('callback', '', PARAM_CLEANHTML);
     $client_id = optional_param('client_id', SITEID, PARAM_RAW);    // client ID
     $contextid = optional_param('ctx_id', SITEID, PARAM_INT);       // context ID
@@ -41,12 +43,11 @@
     $itemid    = optional_param('itemid', '', PARAM_INT);
     $title     = optional_param('title', '', PARAM_FILE);           // new file name
     $page      = optional_param('page', '', PARAM_RAW);             // page
-    $repo_id   = optional_param('repo_id', 1, PARAM_INT);           // repository ID
     $maxbytes  = optional_param('maxbytes', -1, PARAM_INT);           // repository ID
     $req_path  = optional_param('p', '', PARAM_RAW);                // path
     $save_path = optional_param('savepath', '/', PARAM_PATH);
     $search_text   = optional_param('s', '', PARAM_CLEANHTML);
-    $link_external = optional_param('link_external', '', PARAM_ALPHA);
+    $linkexternal = optional_param('linkexternal', '', PARAM_ALPHA);
 
 /// Headers to make it not cacheable
     header("Cache-Control: no-cache, must-revalidate");
@@ -135,7 +136,7 @@
 <html><head>
 <script type="text/javascript">
 if(window.opener){
-    window.opener.repository_callback($repo_id);
+    active_filepicker.list();
     window.close();
 } else {
     alert("{$strhttpsbug }");
@@ -143,7 +144,7 @@ if(window.opener){
 </script>
 <body>
 <noscript>
-{$strrefreshnonjs}
+    {$strrefreshnonjs}
 </noscript>
 </body>
 </html>
@@ -156,6 +157,7 @@ EOD;
 /// These actions all occur on the currently active repository instance
     switch ($action) {
         case 'sign':
+        case 'signin':
         case 'list':
             if ($repo->check_login()) {
                 try {
@@ -195,10 +197,10 @@ EOD;
             break;
         case 'search':
             try {
-                $search_result = $repo->search($search_text);
-                $search_result['search_result'] = true;
+                $search_result = $repo->search($search_text, (int)$page);
                 $search_result['client_id'] = $client_id;
                 $search_result['repo_id'] = $repo_id;
+                $search_result['search_result'] = true;
                 echo json_encode($search_result);
             } catch (repository_exception $e) {
                 $err->e = $e->getMessage();
@@ -232,14 +234,13 @@ EOD;
                 // allow external links in url element all the time
                 $allowexternallink = ($allowexternallink || ($env == 'url'));
 
-                if ($allowexternallink and $link_external === 'yes' and ($repo->supported_returntypes() || FILE_EXTERNAL)) {
+                if ($allowexternallink and $linkexternal === 'yes' and ($repo->supported_returntypes() || FILE_EXTERNAL)) {
                     try {
                         $link = $repo->get_link($file);
                     } catch (repository_exception $e){
                     }
                     $info = array();
-                    $info['client_id'] = $client_id;
-                    $info['file'] = $title;
+                    $info['filename'] = $title;
                     $info['type'] = 'link';
                     $info['url'] = $link;
                     die(json_encode($info));
@@ -255,7 +256,9 @@ EOD;
                     throw new file_exception('maxbytes');
                 }
                 $info = repository::move_to_filepool($filepath, $title, $itemid, $save_path);
-                $info['client_id'] = $client_id;
+                if (empty($info)) {
+                    $info['e'] = get_string('error', 'moodle');
+                }
                 echo json_encode($info);
             } catch (repository_exception $e){
                 $err->e = $e->getMessage();