moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-13766

Browse source 
1. attach seekey to ajax request
2. fix string
This commit is contained in:
dongsheng 2008-08-29 07:45:35 +00:00
parent 7b6757b0d5
commit 0eaa8c5cb0
3 changed files with 44 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
repository/boxnet/repository.class.php
View file

@ -101,6 +101,7 @@ class repository_boxnet extends repository{
// TODO: think about how to search // TODO: think about how to search
$ret['list'] = $tree; $ret['list'] = $tree;
$ret['manage'] = 'http://www.box.net/files'; $ret['manage'] = 'http://www.box.net/files';
$ret['path'] = array(array('name'=>'Root','path'=>null));
$this->listing = $tree; $this->listing = $tree;
return $ret; return $ret;
} else { } else {
@ -143,13 +144,13 @@ class repository_boxnet extends repository{
$e2->name = 'repo_id'; $e2->name = 'repo_id';
$e2->value = $this->id; $e2->value = $this->id;
$e3->label = get_string('username', 'repository_boxnet'); $e3->label = get_string('username', 'repository_boxnet').': ';
$e3->id = 'box_username'; $e3->id = 'box_username';
$e3->type = 'text'; $e3->type = 'text';
$e3->name = 'boxusername'; $e3->name = 'boxusername';
$e3->value = $ret->username; $e3->value = $ret->username;
$e4->label = get_string('password', 'repository_boxnet'); $e4->label = get_string('password', 'repository_boxnet').': ';
$e4->id = 'box_password'; $e4->id = 'box_password';
$e4->type = 'password'; $e4->type = 'password';
$e4->name = 'boxpassword'; $e4->name = 'boxpassword';

4
repository/flickr/repository.class.php
View file

@ -100,13 +100,13 @@ class repository_flickr extends repository{
EOD; EOD;
if($ajax){ if($ajax){
$ret = array(); $ret = array();
$e1->label = get_string('username', 'repository_flickr'); $e1->label = get_string('username', 'repository_flickr').': ';
$e1->id = 'account'; $e1->id = 'account';
$e1->type = 'text'; $e1->type = 'text';
$e1->name = 'flickrmail'; $e1->name = 'flickrmail';
$e2->id = 'keepid'; $e2->id = 'keepid';
$e2->label = get_string('remember', 'repository_flickr'); $e2->label = get_string('remember', 'repository_flickr').' ';
$e2->type = 'checkbox'; $e2->type = 'checkbox';
$e2->name = 'remember'; $e2->name = 'remember';

53
repository/lib.php
View file

@ -616,6 +616,7 @@ function repository_move_to_filepool($path, $name, $itemid, $filearea = 'user_dr
function repository_get_client($context){ function repository_get_client($context){
global $CFG, $USER; global $CFG, $USER;
$suffix = uniqid(); $suffix = uniqid();
$sesskey = sesskey();
$strsaveas = get_string('saveas', 'repository').': '; $strsaveas = get_string('saveas', 'repository').': ';
$stradd = get_string('add', 'repository'); $stradd = get_string('add', 'repository');
$strback = get_string('back', 'repository'); $strback = get_string('back', 'repository');
@ -1002,10 +1003,14 @@ _client.dynload = function (node, fnLoadComplete){
argument:{"node":node, "fnLoadComplete": fnLoadComplete}, argument:{"node":node, "fnLoadComplete": fnLoadComplete},
timeout:600 timeout:600
} }
var trans = YAHOO.util.Connect.asyncRequest('GET', var params = [];
'$CFG->wwwroot/repository/ws.php?ctx_id=$context->id&repo_id=' params['p']=node.path;
+_client.repositoryid+'&p='+node.path+'&action=list', params['env']=_client.env;
callback); params['sesskey']='$sesskey';
params['ctx_id']=$context->id;
params['repo_id']=_client.repositoryid;
var trans = YAHOO.util.Connect.asyncRequest('POST',
'$CFG->wwwroot/repository/ws.php?action=list', callback, _client.postdata(params));
} }
_client.viewlist = function(){ _client.viewlist = function(){
_client.viewmode = 0; _client.viewmode = 0;
@ -1026,15 +1031,14 @@ _client.viewlist = function(){
} }
_client.upload = function(){ _client.upload = function(){
var u = _client.ds.upload; var u = _client.ds.upload;
var conn = YAHOO.util.Connect;
var aform = document.getElementById(u.id); var aform = document.getElementById(u.id);
var parent = document.getElementById(u.id+'_div'); var parent = document.getElementById(u.id+'_div');
var loading = document.createElement('DIV'); var loading = document.createElement('DIV');
loading.innerHTML = "$struploading"; loading.innerHTML = "$struploading";
loading.id = u.id+'_loading'; loading.id = u.id+'_loading';
parent.appendChild(loading); parent.appendChild(loading);
conn.setForm(aform, true, true); YAHOO.util.Connect.setForm(aform, true, true);
conn.asyncRequest('POST', '$CFG->wwwroot/repository/ws.php?ctx_id=$context->id&repo_id='+_client.repositoryid+'&action=upload', _client.upload_cb); var trans = YAHOO.util.Connect.asyncRequest('POST', '$CFG->wwwroot/repository/ws.php?action=upload&sesskey=$sesskey&ctx_id=$context->id&repo_id='+_client.repositoryid, _client.upload_cb);
} }
_client.upload_cb = { _client.upload_cb = {
upload: function(o){ upload: function(o){
@ -1117,14 +1121,19 @@ _client.download = function(){
var title = document.getElementById('newname-$suffix').value; var title = document.getElementById('newname-$suffix').value;
var file = document.getElementById('fileurl-$suffix').value; var file = document.getElementById('fileurl-$suffix').value;
_client.loading(); _client.loading();
var params = [];
params['env']=_client.env;
params['file']=file;
params['title']=title;
params['sesskey']='$sesskey';
params['ctx_id']=$context->id;
params['repo_id']=_client.repositoryid;
var trans = YAHOO.util.Connect.asyncRequest('POST', var trans = YAHOO.util.Connect.asyncRequest('POST',
'$CFG->wwwroot/repository/ws.php?ctx_id=$context->id&repo_id=' '$CFG->wwwroot/repository/ws.php?action=download', _client.dlfile, _client.postdata(params));
+_client.repositoryid+'&action=download',
_client.dlfile, _client.postdata({'env':_client.env, 'file':file, 'title':title}));
} }
// send login request // send login request
_client.login = function(){ _client.login = function(){
var params = {}; var params = [];
var data = _client.ds.login; var data = _client.ds.login;
for (var k in data) { for (var k in data) {
var el = document.getElementsByName(data[k].name)[0]; var el = document.getElementsByName(data[k].name)[0];
@ -1137,10 +1146,10 @@ _client.login = function(){
} }
params['env'] = _client.env; params['env'] = _client.env;
params['ctx_id'] = $context->id; params['ctx_id'] = $context->id;
params['sesskey']= '$sesskey';
_client.loading(); _client.loading();
var trans = YAHOO.util.Connect.asyncRequest('POST', var trans = YAHOO.util.Connect.asyncRequest('POST',
'$CFG->wwwroot/repository/ws.php?action=sign', _client.callback, '$CFG->wwwroot/repository/ws.php?action=sign', _client.callback, _client.postdata(params));
_client.postdata(params));
} }
_client.end = function(str){ _client.end = function(str){
if(_client.env=='form'){ if(_client.env=='form'){
@ -1250,7 +1259,15 @@ _client.req = function(id, path, reset) {
} else { } else {
action = 'list'; action = 'list';
} }
var trans = YAHOO.util.Connect.asyncRequest('GET', '$CFG->wwwroot/repository/ws.php?action='+action+'&ctx_id=$context->id&repo_id='+id+'&p='+path+'&reset='+reset+'&env='+_client.env, _client.callback); var params = [];
params['p'] = path;
params['reset']=reset;
params['env']=_client.env;
params['action']=action;
params['sesskey']='$sesskey';
params['ctx_id']=$context->id;
params['repo_id']=id;
var trans = YAHOO.util.Connect.asyncRequest('POST', '$CFG->wwwroot/repository/ws.php?action='+action, _client.callback, _client.postdata(params));
} }
_client.search = function(id){ _client.search = function(id){
var data = window.prompt("$strsearching"); var data = window.prompt("$strsearching");
@ -1260,7 +1277,13 @@ _client.search = function(id){
} }
_client.viewbar.set('disabled', false); _client.viewbar.set('disabled', false);
_client.loading(); _client.loading();
var trans = YAHOO.util.Connect.asyncRequest('GET', '$CFG->wwwroot/repository/ws.php?action=search&ctx_id=$context->id&repo_id='+id+'&s='+data+'&env='+_client.env, _client.callback); var params = [];
params['s']=data;
params['env']=_client.env;
params['sesskey']='$sesskey';
params['ctx_id']=$context->id;
params['repo_id']=id;
var trans = YAHOO.util.Connect.asyncRequest('POST', '$CFG->wwwroot/repository/ws.php?action=search', _client.callback, _client.postdata(params));
} }
return _client; return _client;