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

Breaking googledocs/picasa/mahara plugins :(

diff --git a/repository/googledocs/repository.class.php b/repository/googledocs/repository.class.php
index 8a8694b1feb2464ef970622d354b438d2188ef4d..f5973a19679047c855f93676eab58901dd518a13 100644 (file)
--- a/repository/googledocs/repository.class.php
+++ b/repository/googledocs/repository.class.php
@@ -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;

diff --git a/repository/mahara/repository.class.php b/repository/mahara/repository.class.php
index a99db28c5628d450b6855efb29b493e0d7c36fb6..c0de8ca9ffa74f45b4dd2131e433369c71230a28 100644 (file)
--- a/repository/mahara/repository.class.php
+++ b/repository/mahara/repository.class.php
@@ -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;

diff --git a/repository/picasa/repository.class.php b/repository/picasa/repository.class.php
index 242f9f88b9f76d32b46fe59ef256585c9073519b..b34b1085ecaf586ce28f6c42129808245b6752c7 100644 (file)
--- a/repository/picasa/repository.class.php
+++ b/repository/picasa/repository.class.php
@@ -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();

diff --git a/repository/repository_ajax.php b/repository/repository_ajax.php
index 6253097a76aff297c3bd86058711a1f830914746..b96f6033c01d4d932f0a172274ed330da23663e3 100755 (executable)
--- a/repository/repository_ajax.php
+++ b/repository/repository_ajax.php
@@ -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