--- loncom/auth/migrateuser.pm 2018/04/14 02:30:11 1.29 +++ loncom/auth/migrateuser.pm 2018/05/08 15:44:11 1.32 @@ -1,7 +1,7 @@ # The LearningOnline Network # Starts a user off based of an existing token. # -# $Id: migrateuser.pm,v 1.29 2018/04/14 02:30:11 raeburn Exp $ +# $Id: migrateuser.pm,v 1.32 2018/05/08 15:44:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -94,6 +94,9 @@ sub lti_check { if ($data->{'lti.target'}) { $lti_env{'request.lti.target'} = $data->{'lti.target'}; } + if ($data->{'lti.sourcecrs'}) { + $lti_env{'request.lti.sourcecrs'} = $data->{'lti.sourcecrs'}; + } } if ($data->{'lti.passbackid'}) { $lti_env{'request.lti.passbackid'} = $data->{'lti.passbackid'}; @@ -420,7 +423,7 @@ sub handler { delete($lti_env->{'selfenrollrole'}); } if ($data{'lti.selfenrollrole'}) { - if (&Apache::ltiauth::lti_enroll($data{'username'},data{'domain'}, + if (&Apache::ltiauth::lti_enroll($data{'username'},$data{'domain'}, $data{'lti.selfenrollrole'}) eq 'ok') { my $url = '/adm/roles?selectrole=1&'. &escape($data{'lti.selfenrollrole'}).'=1'; @@ -483,6 +486,12 @@ sub handler { my $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; if ($data{'origurl'} ne '') { $next_url .= '&orgurl='.&escape($data{'origurl'}); + if ($data{'lti.login'}) { + if (($data{'origurl'} =~ m{/default_\d+\.sequence$}) || + ($data{'origurl'} =~ m{^/res/.+\.sequence$})) { + $next_url .= '&navmap=1'; + } + } } &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home, $next_url,$extra_env,\%form);