--- loncom/interface/lonnavdisplay.pm 2017/11/16 13:41:56 1.35 +++ loncom/interface/lonnavdisplay.pm 2018/12/30 15:58:20 1.37 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Display Handler # -# $Id: lonnavdisplay.pm,v 1.35 2017/11/16 13:41:56 raeburn Exp $ +# $Id: lonnavdisplay.pm,v 1.37 2018/12/30 15:58:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,6 +39,7 @@ use Apache::lonnet; use Apache::lonlocal; use Apache::londocs(); use Apache::lonuserstate; +use LONCAPA::ltiutils; sub handler { my $r = shift; @@ -125,6 +126,20 @@ ENDCLOSE } } + if ($env{'request.lti.login'}) { + if ($env{'request.lti.uri'} ne '') { + my $cid = $env{'request.course.id'}; + my $cnum = $env{'course.'.$cid.'.num'}; + my $cdom = $env{'course.'.$cid.'.domain'}; + my ($scope,$url) = &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},$cdom,$cnum); + if (($scope eq 'map') || ($scope eq 'resource')) { + &Apache::loncommon::content_type($r,'text/html'); + $r->header_out(Location => $url); + return REDIRECT; + } + } + } + # Create the nav map my $navmap = Apache::lonnavmaps::navmap->new(); @@ -242,7 +257,7 @@ ENDCLOSE .""); } } else { - my $link = 'navmaps?jumpToFirstHomework'; + my $link = '/adm/navmaps?jumpToFirstHomework'; if ($env{'form.register'}) { $link .= '&register='.$env{'form.register'}; } @@ -265,7 +280,7 @@ ENDCLOSE $filterFunc = sub { my $res = shift; return $res->completable() || $res->is_map(); }; - my $link = 'navmaps?sort='.$env{'form.sort'}; + my $link = '/adm/navmaps?sort='.$env{'form.sort'}; if ($env{'form.register'}) { $link .= '&register='.$env{'form.register'}; } @@ -277,7 +292,7 @@ ENDCLOSE $env{'form.condition'} = 1; $resource_no_folder_link = 1; } else { - my $link = 'navmaps?sort='.$env{'form.sort'}.'&showOnlyHomework=1'; + my $link = '/adm/navmaps?sort='.$env{'form.sort'}.'&showOnlyHomework=1'; if ($env{'form.register'}) { $link .= '&register='.$env{'form.register'}; }