mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

repository: MDL-20893 return urls hadn't been updated from ws.php to repository_ajax.php

Browse Source 
Breaking googledocs/picasa/mahara plugins :(
This commit is contained in:
Dan Poltawski 2009-11-18 14:21:53 +00:00
parent 3ec8d78626
commit 644e3ad464
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repository/googledocs/repository.class.php
View File

@ -49,7 +49,7 @@ class repository_googledocs extends repository {
$ret = array();
$popup_btn = new stdclass;
$popup_btn->type = 'popup';
$returnurl = $CFG->wwwroot.'/repository/ws.php?callback=yes&repo_id='.$this->id;
$returnurl = $CFG->wwwroot.'/repository/repository_ajax.php?callback=yes&repo_id='.$this->id;
$popup_btn->url = google_authsub::login_url($returnurl, google_docs::REALM);
$ret['login'] = array($popup_btn);
return $ret;

2
repository/mahara/repository.class.php
View File

@ -84,7 +84,7 @@ class repository_mahara extends repository {
$mnetauth = get_auth_plugin('mnet');
$host = $DB->get_record('mnet_host',array('id' => $this->options['peer'])); //need to retrieve the host url
$url = $mnetauth->start_jump_session($host->id, '/repository/ws.php?callback=yes&repo_id='.$this->id, true);
$url = $mnetauth->start_jump_session($host->id, '/repository/repository_ajax.php?callback=yes&repo_id='.$this->id, true);
//set session
$SESSION->loginmahara = true;

2
repository/picasa/repository.class.php
View File

@ -45,7 +45,7 @@ class repository_picasa extends repository {
public function print_login(){
global $CFG;
$returnurl = $CFG->wwwroot.'/repository/ws.php?callback=yes&repo_id='.$this->id;
$returnurl = $CFG->wwwroot.'/repository/repository_ajax.php?callback=yes&repo_id='.$this->id;
$authurl = google_authsub::login_url($returnurl, google_picasa::REALM);
if($this->options['ajax']){
$ret = array();

2
repository/repository_ajax.php
View File

@ -145,7 +145,7 @@
if (!empty($callback)) {
// call opener window to refresh repository
// the callback url should be something like this:
// http://xx.moodle.com/repository/ws.php?callback=yes&repo_id=1&sid=xxx
// http://xx.moodle.com/repository/repository_ajax.php?callback=yes&repo_id=1&sid=xxx
// sid is the attached auth token from external source
// If Moodle is working on HTTPS mode, then we are not allowed to access
// parent window, in this case, we need to alert user to refresh the repository