--- loncom/lti/ltiauth.pm 2018/01/12 20:42:38 1.5
+++ loncom/lti/ltiauth.pm 2019/07/18 18:28:46 1.19
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Basic LTI Authentication Module
#
-# $Id: ltiauth.pm,v 1.5 2018/01/12 20:42:38 raeburn Exp $
+# $Id: ltiauth.pm,v 1.19 2019/07/18 18:28:46 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,13 +36,28 @@ use Apache::lonlocal;
use Apache::lonnet;
use Apache::loncommon;
use Apache::lonacc;
+use Apache::lonrequestcourse;
use LONCAPA::ltiutils;
sub handler {
my $r = shift;
my $requri = $r->uri;
#
-# Retrieve data POSTed by LTI Consumer on launch
+# Check for existing session, and temporarily delete any form items
+# in %env, if session exists
+#
+ my %savedform;
+ my $handle = &Apache::lonnet::check_for_valid_session($r);
+ if ($handle ne '') {
+ foreach my $key (sort(keys(%env))) {
+ if ($key =~ /^form\.(.+)$/) {
+ $savedform{$1} = $env{$key};
+ delete($env{$key});
+ }
+ }
+ }
+#
+# Retrieve data POSTed by LTI Consumer on launch
#
&Apache::lonacc::get_posted_cgi($r);
my $params = {};
@@ -51,6 +66,17 @@ sub handler {
$params->{$1} = $env{$key};
}
}
+#
+# Check for existing session, and restored temporarily
+# deleted form items to %env, if session exists.
+#
+ if ($handle ne '') {
+ if (keys(%savedform)) {
+ foreach my $key (sort(keys(%savedform))) {
+ $env{'form.'.$key} = $savedform{$key};
+ }
+ }
+ }
unless (keys(%{$params})) {
&invalid_request($r,1);
@@ -139,7 +165,7 @@ sub handler {
# Order is:
#
# (a) from custom_coursedomain item in POSTed data
-# (b) from tail of requested URL (after /adm/lti) if it has format of a symb
+# (b) from tail of requested URL (after /adm/lti/) if it has format of a symb
# (c) from tail of requested URL (after /adm/lti) if it has format of a map
# (d) from tail of requested URL (after /adm/lti) if it has format /domain/courseID
# (e) from tail of requested URL (after /adm/lti) if it has format /tiny/domain/\w+
@@ -179,9 +205,15 @@ sub handler {
$mapurl = $tail;
} else {
$symb = $tail;
- $symb =~ s{^/+}{};
+ $symb =~ s{^/}{};
+ }
+ } elsif ($tail =~ m{^/res/(?:$match_domain)/(?:$match_username)/.+\.(?:sequence|page)(|___\d+___.+)$}) {
+ if ($1 eq '') {
+ $mapurl = $tail;
+ } else {
+ $symb = $tail;
+ $symb =~ s{^/res/}{};
}
-#FIXME Need to handle encrypted URLs
} elsif ($tail =~ m{^/($match_domain)/($match_courseid)$}) {
($urlcdom,$urlcnum) = ($1,$2);
if (($cdom ne '') && ($cdom ne $urlcdom)) {
@@ -262,7 +294,13 @@ sub handler {
$protocol = 'https';
}
- my ($itemid,$consumer_key,$secret,@ltiroles);
+ if (exists($params->{'oauth_callback'})) {
+ $Net::OAuth::PROTOCOL_VERSION = Net::OAuth::PROTOCOL_VERSION_1_0A;
+ } else {
+ $Net::OAuth::PROTOCOL_VERSION = Net::OAuth::PROTOCOL_VERSION_1_0;
+ }
+
+ my ($itemid,$consumer_key,$secret);
$consumer_key = $params->{'oauth_consumer_key'};
if (ref($lti_by_key{$consumer_key}) eq 'ARRAY') {
foreach my $id (@{$lti_by_key{$consumer_key}}) {
@@ -301,7 +339,31 @@ sub handler {
}
#
-# Determinine if source of username matches requirement from the
+# Determine if a username is required from the domain
+# configuration for the specific LTI Consumer
+#
+
+ if (!$lti{$itemid}{'requser'}) {
+ if ($tail =~ m{^/tiny/($match_domain)/(\w+)$}) {
+ foreach my $key (%{$params}) {
+ delete($env{'form.'.$key});
+ }
+ my $ltoken = &Apache::lonnet::tmpput({'linkprot' => $itemid.':'.$tail},
+ $lonhost);
+ if ($ltoken) {
+ $r->internal_redirect($tail.'?ltoken='.$ltoken);
+ $r->set_handlers('PerlHandler'=> undef);
+ } else {
+ &invalid_request($r,9);
+ }
+ } else {
+ &invalid_request($r,10);
+ }
+ return OK;
+ }
+
+#
+# Determine if source of username matches requirement from the
# domain configuration for the specific LTI Consumer.
#
@@ -329,7 +391,7 @@ sub handler {
#
# (a) from course mapping (if the link between Consumer "course" and
# Provider "course" has been established previously).
-# (b) from tail of requested URL (after /adm/lti) if it has format of a symb
+# (b) from tail of requested URL (after /adm/lti/) if it has format of a symb
# (c) from tail of requested URL (after /adm/lti) if it has format of a map
# (d) from tail of requested URL (after /adm/lti) if it has format /domain/courseID
# (e) from tail of requested URL (after /adm/lti) if it has format /tiny/domain/\w+
@@ -356,7 +418,7 @@ sub handler {
if ($consumers{$sourcecrs} =~ /^$match_courseid$/) {
my $crshome = &Apache::lonnet::homeserver($consumers{$sourcecrs},$cdom);
if ($crshome =~ /(con_lost|no_host|no_such_host)/) {
- &invalid_request($r,9);
+ &invalid_request($r,11);
return OK;
} else {
$posscnum = $consumers{$sourcecrs};
@@ -368,7 +430,7 @@ sub handler {
if ($urlcnum ne '') {
if ($posscnum ne '') {
if ($posscnum ne $urlcnum) {
- &invalid_request($r,10);
+ &invalid_request($r,12);
return OK;
} else {
$cnum = $posscnum;
@@ -376,7 +438,7 @@ sub handler {
} else {
my $crshome = &Apache::lonnet::homeserver($urlcnum,$cdom);
if ($crshome =~ /(con_lost|no_host|no_such_host)/) {
- &invalid_request($r,11);
+ &invalid_request($r,13);
return OK;
} else {
$cnum = $urlcnum;
@@ -387,43 +449,25 @@ sub handler {
}
#
-# Get LON-CAPA role to use from role-mapping of Consumer roles
+# Get LON-CAPA role(s) to use from role-mapping of Consumer roles
# defined in domain configuration for the appropriate LTI
# Consumer.
#
-# If multiple LON-CAPA roles are indicated, choose based
-# on the order: cc, in, ta, ep, st
+# If multiple LON-CAPA roles are indicated for the current user,
+# ordering (from first to last) is: cc/co, in, ta, ep, st.
#
- my $reqrole;
-
- my @roleorder = ('cc','in','ta','ep','st');
- if ($params->{'roles'} =~ /,/) {
- @ltiroles = split(/\s*,\s*/,$params->{'role'});
- } else {
- my $singlerole = $params->{'roles'};
- $singlerole =~ s/^\s|\s+$//g;
- @ltiroles = ($singlerole);
- }
- if (@ltiroles) {
- if (ref($lti{$itemid}{maproles}) eq 'HASH') {
- my %possroles;
- map { $possroles{$lti{$itemid}{maproles}{$_}} = 1; } @ltiroles;
- my @possibles = keys(%possroles);
- if (@possibles == 1) {
- if (grep(/^\Q$possibles[0]\E$/,@roleorder)) {
- $reqrole = $possibles[0];
-
- }
- } elsif (@possibles > 1) {
- foreach my $item (@roleorder) {
- if ($possroles{$item}) {
- $reqrole = $item;
- last;
- }
- }
- }
- }
+ my (@ltiroles,@lcroles);
+ my @lcroleorder = ('cc','in','ta','ep','st');
+ my ($lcrolesref,$ltirolesref) =
+ &LONCAPA::ltiutils::get_lc_roles($params->{'roles'},
+ \@lcroleorder,
+ $lti{$itemid}{maproles});
+ if (ref($lcrolesref) eq 'ARRAY') {
+ @lcroles = @{$lcrolesref};
+ }
+ if (ref($ltirolesref) eq 'ARRAY') {
+ @ltiroles = @{$ltirolesref};
}
#
@@ -440,38 +484,71 @@ sub handler {
foreach my $ltirole (@ltiroles) {
if (grep(/^\Q$ltirole\E$/,@{$lti{$itemid}{'makeuser'}})) {
$selfcreate = 1;
+ last;
}
}
}
}
if ($selfcreate) {
-#FIXME Do user creation here.
- return OK
+ my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts);
+ my $domdesc = &Apache::lonnet::domain($udom,'description');
+ my %data = (
+ 'permanentemail' => $env{'form.lis_person_contact_email_primary'},
+ 'firstname' => $env{'form.lis_person_name_given'},
+ 'lastname' => $env{'form.lis_person_name_family'},
+ 'fullname' => $env{'form.lis_person_name_full'},
+ );
+ my $result =
+ &LONCAPA::ltiutils::create_user($lti{$itemid},$uname,$udom,
+ $domdesc,\%data,\%alerts,\%rulematch,
+ \%inst_results,\%curr_rules,%got_rules);
+ if ($result eq 'notallowed') {
+ &invalid_request($r,14);
+ } elsif ($result eq 'ok') {
+ if (($ltiroles[0] eq 'Instructor') && ($lcroles[0] eq 'cc') && ($lti{$itemid}{'mapcrs'}) &&
+ ($lti{$itemid}{'makecrs'})) {
+ unless (&Apache::lonnet::usertools_access($uname,$udom,'lti','reload','requestcourses')) {
+ &Apache::lonnet::put('environment',{ 'requestcourses.lti' => 'autolimit=', },$udom,$uname);
+ }
+ }
+ } else {
+ &invalid_request($r,15);
+ return OK;
+ }
} else {
- &invalid_request($r,12);
+ &invalid_request($r,16);
return OK;
- }
- }
+ }
+ }
} else {
- &invalid_request($r,13);
+ &invalid_request($r,17);
return OK;
}
#
# If no LON-CAPA course available, check if domain's configuration
# for the specific LTI Consumer allows a new course to be created
-# (requires role in Consumer to be: Instructor).
+# (requires role in Consumer to be: Instructor and Instructor to map to CC)
#
+ my $reqcrs;
if ($cnum eq '') {
- if ((@ltiroles) && (grep(/^Instructor$/,@ltiroles)) &&
- ($lti{$itemid}{'mapcrs'})) {
-#FIXME Create a new LON-CAPA course here.
- return OK;
+ if ((@ltiroles) && ($lti{$itemid}{'mapcrs'}) &&
+ ($ltiroles[0] eq 'Instructor') && ($lcroles[0] eq 'cc') && ($lti{$itemid}{'makecrs'})) {
+ my (%can_request,%request_domains);
+ &Apache::lonnet::check_can_request($cdom,\%can_request,\%request_domains,$uname,$udom);
+ if ($can_request{'lti'}) {
+ $reqcrs = 1;
+ <i_session($r,$itemid,$uname,$udom,$uhome,$lonhost,undef,$mapurl,$tail,
+ $symb,$cdom,$cnum,$params,\@ltiroles,$lti{$itemid},\@lcroles,
+ $reqcrs,$sourcecrs);
+ } else {
+ &invalid_request($r,18);
+ }
} else {
- &invalid_request($r,14);
- return OK;
+ &invalid_request($r,19);
}
+ return OK;
}
#
@@ -479,48 +556,181 @@ sub handler {
# indicated is cc, change role indicated to co.
#
- if ($reqrole eq 'cc') {
+ my %crsenv;
+ if ($lcroles[0] eq 'cc') {
if (($cdom ne '') && ($cnum ne '')) {
- my %crsenv = &Apache::lonnet::coursedescription($cnum.'_'.$cdom,{ 'one_time' => 1,});
+ %crsenv = &Apache::lonnet::coursedescription($cdom.'_'.$cnum,{ 'one_time' => 1,});
if ($crsenv{'type'} eq 'Community') {
- $reqrole = 'co';
+ $lcroles[0] = 'co';
}
}
}
#
-# Determine if user has required LON-CAPA role
-# in the mapped LON-CAPA course.
+# Determine if user has a LON-CAPA role in the mapped LON-CAPA course.
+# If multiple LON-CAPA roles are available for the user's assigned LTI roles,
+# choose the first available LON-CAPA role in the order: cc/co, in, ta, ep, st
#
- my $role;
- my %crsroles = &Apache::lonnet::get_my_roles($uname,$udom,'userroles',undef,[$reqrole],[$cdom]);
- if (exists($crsroles{$cnum.':'.$cdom.':'.$reqrole})) {
- $role = $reqrole.'./'.$cdom.'/'.$cnum;
-#FIXME Need to accommodate sections
- } elsif (ref($lti{$itemid}{'selfenroll'}) eq 'ARRAY') {
- if (grep(/^\Q$reqrole\E$/,@{$lti{$itemid}{'selfenroll'}})) {
-#FIXME Do self-enrollment here
+ my ($role,$usec,$withsec);
+ unless ((($lcroles[0] eq 'cc') || ($lcroles[0] eq 'co')) && (@lcroles == 1)) {
+ if ($lti{$itemid}{'section'} ne '') {
+ if ($lti{$itemid}{'section'} eq 'course_section_sourcedid') {
+ if ($env{'form.course_section_sourcedid'} !~ /\W/) {
+ $usec = $env{'form.course_section_sourcedid'};
+ }
+ } elsif ($env{'form.'.$lti{$itemid}{'section'}} !~ /\W/) {
+ $usec = $env{'form.'.$lti{$itemid}{'section'}};
+ }
+ }
+ if ($usec ne '') {
+ $withsec = 1;
+ }
+ }
+
+ if (@lcroles) {
+ my %crsroles = &Apache::lonnet::get_my_roles($uname,$udom,'userroles',undef,\@lcroles,
+ [$cdom],$withsec);
+ foreach my $reqrole (@lcroles) {
+ if ($withsec) {
+ my $incsec;
+ if (($reqrole eq 'cc') || ($reqrole eq 'co')) {
+ $incsec = '';
+ } else {
+ $incsec = $usec;
+ }
+ if (exists($crsroles{$cnum.':'.$cdom.':'.$reqrole.':'.$incsec})) {
+ $role = $reqrole.'./'.$cdom.'/'.$cnum;
+ if ($incsec ne '') {
+ $role .= '/'.$usec;
+ }
+ last;
+ }
+ } else {
+ if (exists($crsroles{$cnum.':'.$cdom.':'.$reqrole})) {
+ $role = $reqrole.'./'.$cdom.'/'.$cnum;
+ last;
+ }
+ }
+ }
+ }
+
+#
+# Determine if user can selfenroll
+#
+
+ my ($reqrole,$selfenrollrole);
+ if ($role eq '') {
+ if ((@ltiroles) && (ref($lti{$itemid}{'selfenroll'}) eq 'ARRAY')) {
+ foreach my $ltirole (@ltiroles) {
+ if (grep(/^\Q$ltirole\E$/,@{$lti{$itemid}{'selfenroll'}})) {
+ if (ref($lti{$itemid}{maproles}) eq 'HASH') {
+ $reqrole = $lti{$itemid}{maproles}{$ltirole};
+ last;
+ }
+ }
+ }
+ }
+ if ($reqrole eq '') {
+ &invalid_request($r,20);
return OK;
} else {
- &invalid_request($r,15);
- return OK;
+ unless (%crsenv) {
+ %crsenv = &Apache::lonnet::coursedescription($cdom.'_'.$cnum);
+ }
+ my $default_enrollment_start_date = $crsenv{'default_enrollment_start_date'};
+ my $default_enrollment_end_date = $crsenv{'default_enrollment_end_date'};
+ my $now = time;
+ if ($default_enrollment_end_date && $default_enrollment_end_date <= $now) {
+ &invalid_request($r,21);
+ return OK;
+ } elsif ($default_enrollment_start_date && $default_enrollment_start_date >$now) {
+ &invalid_request($r,22);
+ return OK;
+ } else {
+ $selfenrollrole = $reqrole.'./'.$cdom.'/'.$cnum;
+ if (($withsec) && ($reqrole ne 'cc') && ($reqrole ne 'co')) {
+ if ($usec ne '') {
+ $selfenrollrole .= '/'.$usec;
+ }
+ }
+ }
}
}
#
# Store consumer-to-LON-CAPA course mapping
#
+
if (($sourcecrs ne '') && ($consumers{$sourcecrs} eq '') && ($cnum ne '')) {
&Apache::lonnet::put_dom('lticonsumers',{ $sourcecrs => $cnum },$cdom);
}
#
-# Check if user should be hosted here or switched to another server.
+# Start user session
#
- &Apache::lonnet::logthis(" LTI authorized user: $uname:$udom role: $role course: $cdom\_$cnum");
+ <i_session($r,$itemid,$uname,$udom,$uhome,$lonhost,$role,$mapurl,$tail,$symb,
+ $cdom,$cnum,$params,\@ltiroles,$lti{$itemid},\@lcroles,undef,$sourcecrs,
+ $selfenrollrole);
+ return OK;
+}
+
+sub lti_enroll {
+ my ($uname,$udom,$selfenrollrole) = @_;
+ my $enrollresult;
+ my ($role,$cdom,$cnum,$sec) =
+ ($selfenrollrole =~ m{^(\w+)\./($match_domain)/($match_courseid)(?:|/(\w*))$});
+ if (($cnum ne '') && ($cdom ne '')) {
+ my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
+ if ($chome ne 'no_host') {
+ my %coursehash = &Apache::lonnet::coursedescription($cdom.'_'.$cnum);
+ my $start = $coursehash{'default_enrollment_start_date'};
+ my $end = $coursehash{'default_enrollment_end_date'};
+ $enrollresult = &LONCAPA::ltiutils::enrolluser($udom,$uname,$role,$cdom,$cnum,$sec,
+ $start,$end,1);
+ }
+ }
+ return $enrollresult;
+}
+
+sub lti_reqcrs {
+ my ($r,$cdom,$form,$uname,$udom) = @_;
+ my (%can_request,%request_domains);
+ &Apache::lonnet::check_can_request($cdom,\%can_request,\%request_domains,$uname,$udom);
+ if ($can_request{'lti'}) {
+ my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$cdom);
+ my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+ &Apache::lonrequestcourse::print_textbook_form($r,$cdom,[$cdom],\%domdefs,
+ $domconfig{'requestcourses'},
+ \%can_request,'lti',$form);
+ } else {
+ $r->print(
+ &Apache::loncommon::start_page('Invalid LTI call',undef,{'only_body' => 1}).
+ &mt('Invalid LTI call').
+ &Apache::loncommon::end_page()
+ );
+ }
+}
+
+sub lti_session {
+ my ($r,$itemid,$uname,$udom,$uhome,$lonhost,$role,$mapurl,$tail,$symb,$cdom,$cnum,
+ $params,$ltiroles,$ltihash,$lcroles,$reqcrs,$sourcecrs,$selfenrollrole) = @_;
+ return unless ((ref($params) eq 'HASH') && (ref($ltiroles) eq 'ARRAY') &&
+ (ref($ltihash) eq 'HASH') && (ref($lcroles) eq 'ARRAY'));
+#
+# Check if user should be hosted here or switched to another server.
+#
$r->user($uname);
+ if ($cnum) {
+ if ($role) {
+ &Apache::lonnet::logthis(" LTI authorized user ($itemid): $uname:$udom, role: $role, course: $cdom\_$cnum");
+ } elsif ($selfenrollrole =~ m{^(\w+)\./$cdom/$cnum}) {
+ &Apache::lonnet::logthis(" LTI authorized user ($itemid): $uname:$udom, desired role: $1 course: $cdom\_$cnum");
+ }
+ } else {
+ &Apache::lonnet::logthis(" LTI authorized user ($itemid): $uname:$udom, course dom: $cdom");
+ }
my ($is_balancer,$otherserver,$hosthere);
($is_balancer,$otherserver) =
&Apache::lonnet::check_loadbalancing($uname,$udom,'login');
@@ -539,16 +749,53 @@ sub handler {
}
}
}
+ my $protocol = 'http';
+ if ($ENV{'SERVER_PORT'} == 443) {
+ $protocol = 'https';
+ }
if (($is_balancer) && (!$hosthere)) {
# login but immediately go to switch server.
&Apache::lonauth::success($r,$uname,$udom,$uhome,'noredirect');
+ if (($ltihash->{'callback'}) && ($params->{$ltihash->{'callback'}})) {
+ &LONCAPA::ltiutils::setup_logout_callback($uname,$udom,$otherserver,
+ $ltihash->{'key'},
+ $ltihash->{'secret'},
+ $params->{$ltihash->{'callback'}},
+ $r->dir_config('ltiIDsDir'),
+ $protocol,$r->hostname);
+ }
if ($symb) {
$env{'form.symb'} = $symb;
+ $env{'request.lti.uri'} = $tail;
+ } else {
+ if ($mapurl) {
+ $env{'form.origurl'} = $mapurl;
+ $env{'request.lti.uri'} = $mapurl;
+ } elsif ($tail =~ m{^\Q/tiny/$cdom/\E\w+$}) {
+ $env{'form.origurl'} = $tail;
+ $env{'request.lti.uri'} = $tail;
+ } elsif ($tail eq "/$cdom/$cnum") {
+ $env{'form.origurl'} = '/adm/navmaps';
+ $env{'request.lti.uri'} = $tail;
+ } else {
+ unless ($tail eq '/adm/roles') {
+ $env{'form.origurl'} = '/adm/navmaps';
+ }
+ }
}
if ($role) {
$env{'form.role'} = $role;
}
- if ($lti{$itemid}{'passback'}) {
+ if (($lcroles->[0] eq 'cc') && ($reqcrs)) {
+ $env{'request.lti.reqcrs'} = 1;
+ $env{'request.lti.reqrole'} = 'cc';
+ $env{'request.lti.sourcecrs'} = $sourcecrs;
+ }
+ if ($selfenrollrole) {
+ $env{'request.lti.selfenrollrole'} = $selfenrollrole;
+ $env{'request.lti.sourcecrs'} = $sourcecrs;
+ }
+ if ($ltihash->{'passback'}) {
if ($params->{'lis_result_sourcedid'}) {
$env{'request.lti.passbackid'} = $params->{'lis_result_sourcedid'};
}
@@ -556,15 +803,18 @@ sub handler {
$env{'request.lti.passbackurl'} = $params->{'lis_outcome_service_url'};
}
}
- if (($lti{$itemid}{'roster'}) && (grep(/^Instructor$/,@ltiroles))) {
+ if (($ltihash->{'roster'}) && (grep(/^Instructor$/,@{$ltiroles}))) {
if ($params->{'ext_ims_lis_memberships_id'}) {
- $env{'request.lti.rosterid'} = $params->{'ext_ims_lis_memberships_id'};
+ $env{'request.lti.rosterid'} = $params->{'ext_ims_lis_memberships_id'};
}
if ($params->{'ext_ims_lis_memberships_url'}) {
$env{'request.lti.rosterurl'} = $params->{'ext_ims_lis_memberships_url'};
}
}
- $env{'request.lti.login'} = 1;
+ $env{'request.lti.login'} = $itemid;
+ if ($params->{'launch_presentation_document_target'}) {
+ $env{'request.lti.target'} = $params->{'launch_presentation_document_target'};
+ }
foreach my $key (%{$params}) {
delete($env{'form.'.$key});
}
@@ -580,20 +830,37 @@ sub handler {
foreach my $key (%{$params}) {
delete($env{'form.'.$key});
}
+ if (($ltihash->{'callback'}) && ($params->{$ltihash->{'callback'}})) {
+ &LONCAPA::ltiutils::setup_logout_callback($uname,$udom,$lonhost,
+ $ltihash->{'key'},
+ $ltihash->{'secret'},
+ $params->{$ltihash->{'callback'}},
+ $r->dir_config('ltiIDsDir'),
+ $protocol,$r->hostname);
+ }
my $ip = $r->get_remote_host();
my %info=('ip' => $ip,
'domain' => $udom,
'username' => $uname,
'server' => $lonhost,
- 'lti.login' => 1,
+ 'lti.login' => $itemid,
+ 'lti.uri' => $tail,
);
if ($role) {
$info{'role'} = $role;
}
if ($symb) {
- $info{'symb'} = $symb;
+ $info{'symb'} = $symb;
}
- if ($lti{$itemid}{'passback'}) {
+ if (($lcroles->[0] eq 'cc') && ($reqcrs)) {
+ $info{'lti.reqcrs'} = 1;
+ $info{'lti.reqrole'} = 'cc';
+ $info{'lti.sourcecrs'} = $sourcecrs;
+ }
+ if ($selfenrollrole) {
+ $info{'lti.selfenrollrole'} = $selfenrollrole;
+ }
+ if ($ltihash->{'passback'}) {
if ($params->{'lis_result_sourcedid'}) {
$info{'lti.passbackid'} = $params->{'lis_result_sourcedid'}
}
@@ -601,7 +868,7 @@ sub handler {
$info{'lti.passbackurl'} = $params->{'lis_outcome_service_url'}
}
}
- if (($lti{$itemid}{'roster'}) && (grep(/^Instructor$/,@ltiroles))) {
+ if (($ltihash->{'roster'}) && (grep(/^Instructor$/,@{$ltiroles}))) {
if ($params->{'ext_ims_lis_memberships_id'}) {
$info{'lti.rosterid'} = $params->{'ext_ims_lis_memberships_id'};
}
@@ -609,12 +876,15 @@ sub handler {
$info{'lti.rosterurl'} = $params->{'ext_ims_lis_memberships_url'};
}
}
+ if ($params->{'launch_presentation_document_target'}) {
+ $info{'lti.target'} = $params->{'launch_presentation_document_target'};
+ }
+
unless ($info{'symb'}) {
if ($mapurl) {
$info{'origurl'} = $mapurl;
- if ($mapurl =~ m{/default_\d+\.sequence$}) {
- $info{'origurl'} .= (($mapurl =~/\?/)?'&':'?').'navmap=1';
- }
+ } elsif ($tail =~ m{^\Q/tiny/$cdom/\E\w+$}) {
+ $info{'origurl'} = $tail;
} else {
unless ($tail eq '/adm/roles') {
$info{'origurl'} = '/adm/navmaps';
@@ -629,7 +899,7 @@ sub handler {
$r->internal_redirect('/adm/migrateuser');
$r->set_handlers('PerlHandler'=> undef);
}
- return OK;
+ return;
}
sub invalid_request {
@@ -641,7 +911,7 @@ sub invalid_request {
}
&Apache::lonlocal::get_language_handle($r);
$r->print(
- &Apache::loncommon::start_page('Invalid LTI call').
+ &Apache::loncommon::start_page('Invalid LTI call','',{ 'only_body' => 1,}).
&mt('Invalid LTI call [_1]',$num).
&Apache::loncommon::end_page());
return;