portfolio - MDL-19356 - Mahara portfolio plugin: removed session use

since we can construct whatever return url we want.

diff --git a/portfolio/type/mahara/preconfig.php b/portfolio/type/mahara/preconfig.php
index c74ed82b06fa479eb774bc2a8aed7e54eaa7cd9d..099ae6764a78109cbdcbb6631e78465dac922a9a 100644 (file)
--- a/portfolio/type/mahara/preconfig.php
+++ b/portfolio/type/mahara/preconfig.php
@@ -10,22 +10,24 @@ require_once($CFG->dirroot . '/mnet/lib.php');
 
 require_login();
 
-if (!$landed = optional_param('landed', false, PARAM_BOOL)) {
-    $id = required_param('id', PARAM_INT);
+$id     = required_param('id', PARAM_INT);              // id of current export
+$landed = optional_param('landed', false, PARAM_BOOL);  // this is the parameter we get back after we've jumped to mahara
+
+if (!$landed) {
     $exporter = portfolio_exporter::rewaken_object($id);
     $exporter->verify_rewaken();
 
     $mnetauth = get_auth_plugin('mnet');
-    if (!$url = $mnetauth->start_jump_session($exporter->get('instance')->get_config('mnethostid'), '/portfolio/type/mahara/preconfig.php?landed=1', true)) {
+    if (!$url = $mnetauth->start_jump_session($exporter->get('instance')->get_config('mnethostid'), '/portfolio/type/mahara/preconfig.php?landed=1&id=' . $id, true)) {
         throw new porfolio_exception('failedtojump', 'portfolio_mahara');
     }
     redirect($url);
 } else {
     // now we have the sso session set up, start sending intent stuff and then redirect back to portfolio/add.php when we're done
-    $exporter = portfolio_exporter::rewaken_object($SESSION->portfolioexport);
+    $exporter = portfolio_exporter::rewaken_object($id);
     $exporter->verify_rewaken();
 
     $exporter->get('instance')->send_intent();
-    redirect($CFG->wwwroot . '/portfolio/add.php?postcontrol=1&id=' . $exporter->get('id'));
+    redirect($CFG->wwwroot . '/portfolio/add.php?postcontrol=1&id=' . $id);
 }