"REPOSITORY/MDL-18357, make search respect mimetype restrictions"

diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php
index 428eeb2b2ba177fccb36c8177d53f56a8ee3e579..393ebf95029337a76c7287b5aa89786d8c748db3 100755 (executable)
--- a/repository/boxnet/repository.class.php
+++ b/repository/boxnet/repository.class.php
@@ -162,7 +162,7 @@ class repository_boxnet extends repository {
                 }
             }
         }
-        $ret['list'] = $list;
+        $ret['list'] = array_filter($list, array($this, 'filter'));
         return $ret;
     }
 
@@ -181,7 +181,7 @@ class repository_boxnet extends repository {
         $ret['manage'] = 'http://www.box.net/files';
         $ret['path'] = array(array('name'=>'Root', 'path'=>0));
         if(!empty($tree)) {
-            $ret['list']   = array_filter($tree, array($this, 'filter'));
+            $ret['list'] = array_filter($tree, array($this, 'filter'));
         }
         return $ret;
     }

diff --git a/repository/flickr/repository.class.php b/repository/flickr/repository.class.php
index 5fc55ebfabaf93a62516a276f8499ceea1e0738c..a6c8af3490448e82198886d43c38917744fcd209 100755 (executable)
--- a/repository/flickr/repository.class.php
+++ b/repository/flickr/repository.class.php
@@ -187,7 +187,9 @@ class repository_flickr extends repository {
             'extras'=>'original_format',
             'text'=>$search_text
             ));
-        return $this->build_list($photos);
+        $ret = $this->build_list($photos);
+        $ret['list'] = array_filter($ret['list'], array($this, 'filter'));
+        return $ret;
     }
 
     /**

diff --git a/repository/flickr_public/repository.class.php b/repository/flickr_public/repository.class.php
index 1262ff42f4a537245b4c97e63b3d3e4b6cdb8177..e6f6cfe9a453a69ab5f49fdb931cf6862d2dcd4f 100644 (file)
--- a/repository/flickr_public/repository.class.php
+++ b/repository/flickr_public/repository.class.php
@@ -178,7 +178,9 @@ class repository_flickr_public extends repository {
                 'text'=>$SESSION->{$this->sess_text}));
         }
         $ret = array();
-        return $this->build_list($photos, $page, $ret);
+        $ret = $this->build_list($photos, $page, $ret);
+        $ret['list'] = array_filter($ret['list'], array($this, 'filter'));
+        return $ret;
     }
 
     /**

diff --git a/repository/javascript.php b/repository/javascript.php
index 50706986db3af0b050301510f87dfc40263582a6..ffff5b4b188af763578f92aaee018d5d2fd96e1a 100644 (file)
--- a/repository/javascript.php
+++ b/repository/javascript.php
@@ -276,6 +276,7 @@ this.create_picker = function() {
             params['s'] = keyword;
             params['env']=_client.env;
             params['action']='gsearch';
+            params['accepted_types'] = _client.accepted_types;
             params['sesskey']='$sesskey';
             params['ctx_id']=$context->id;
             _client.loading('load');
@@ -642,6 +643,7 @@ _client.viewthumb = function(ds) {
                         params['repo_id'] = _client.repositoryid;
                         params['ctx_id'] = $context->id;
                         params['sesskey']= '$sesskey';
+                        params['accepted_types'] = _client.accepted_types;
                         _client.loading('load');
                         var trans = YAHOO.util.Connect.asyncRequest('POST',
                                 '$CFG->httpswwwroot/repository/ws.php?action=list', _client.req_cb, _client.postdata(params));
@@ -745,6 +747,7 @@ _client.dynload = function (node, fnLoadComplete) {
     params['sesskey']='$sesskey';
     params['ctx_id']=$context->id;
     params['repo_id']=_client.repositoryid;
+    params['accepted_types'] = _client.accepted_types;
     var trans = YAHOO.util.Connect.asyncRequest('POST',
             '$CFG->httpswwwroot/repository/ws.php?action=list', callback, _client.postdata(params));
 }
@@ -887,6 +890,7 @@ _client.search_paging = function(id, path, page) {
     params['p'] = path;
     params['page'] = page;
     params['env']=_client.env;
+    params['accepted_types'] = _client.accepted_types;
     params['action']='search';
     params['search_paging']='true';
     params['sesskey']='$sesskey';
@@ -987,11 +991,9 @@ _client.req = function(id, path, page) {
     _client.viewbar.set('disabled', false);
     _client.loading('load');
     _client.repositoryid = id;
-    action = 'list';
     var params = [];
     params['p'] = path;
     params['env']=_client.env;
-    params['action']=action;
     params['sesskey']='$sesskey';
     params['ctx_id']=$context->id;
     params['repo_id']=id;
@@ -999,7 +1001,7 @@ _client.req = function(id, path, page) {
         params['page']=page;
     }
     params['accepted_types'] = _client.accepted_types;
-    var trans = YAHOO.util.Connect.asyncRequest('POST', '$CFG->httpswwwroot/repository/ws.php?action='+action, _client.req_cb, _client.postdata(params));
+    var trans = YAHOO.util.Connect.asyncRequest('POST', '$CFG->httpswwwroot/repository/ws.php?action=list', _client.req_cb, _client.postdata(params));
 }
 _client.logout = function(id) {
     _client.repositoryid = id;
@@ -1130,7 +1132,7 @@ $js .= "\r\n";
 $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')));
-$accpeted_file_ext = json_encode($ft->get_file_ext($accepted_filetypes));
+$accepted_file_ext = json_encode($ft->get_file_ext($accepted_filetypes));
 $js .= <<<EOD
 function openpicker_$suffix(params) {
     if(params.filetype) {
@@ -1142,7 +1144,7 @@ function openpicker_$suffix(params) {
             repository_client_$suffix.accepted_types = '*';
         }
     } else {
-        repository_client_$suffix.accepted_types = $accpeted_file_ext;
+        repository_client_$suffix.accepted_types = $accepted_file_ext;
     }
     if(!repository_client_$suffix.instance) {
         repository_client_$suffix.env = params.env;