repository: MDL-20893 return urls hadn't been updated from ws.php to repository_ajax.php
authorDan Poltawski <dan.poltawski@lancaster.ac.uk>
Wed, 18 Nov 2009 14:21:53 +0000 (14:21 +0000)
committerDan Poltawski <dan.poltawski@lancaster.ac.uk>
Wed, 18 Nov 2009 14:21:53 +0000 (14:21 +0000)
Breaking googledocs/picasa/mahara plugins :(

repository/googledocs/repository.class.php
repository/mahara/repository.class.php
repository/picasa/repository.class.php
repository/repository_ajax.php

index 8a8694b..f5973a1 100644 (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;
index a99db28..c0de8ca 100644 (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;
index 242f9f8..b34b108 100644 (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();
index 6253097..b96f603 100755 (executable)
     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