--- rat/lonsequence.pm 2021/06/24 21:22:27 1.48.2.3 +++ rat/lonsequence.pm 2018/04/14 17:52:53 1.50 @@ -2,7 +2,7 @@ # # Sequence Handler # -# $Id: lonsequence.pm,v 1.48.2.3 2021/06/24 21:22:27 raeburn Exp $ +# $Id: lonsequence.pm,v 1.50 2018/04/14 17:52:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,6 +36,7 @@ use Apache::lonnet; use Apache::Constants qw(:common :http REDIRECT); use GDBM_File; use LONCAPA::map(); +use LONCAPA::ltiutils; use LONCAPA; use Apache::lonpageflip(); use Apache::loncommon(); @@ -245,41 +246,48 @@ sub handler { } } - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - - my $mapurl = &Apache::lonnet::declutter($requrl); - my $maptitle = &Apache::lonnet::gettitle($mapurl); - my @crumbs = ({text => $maptitle, no_mt => 1}); - my $args = {'bread_crumbs' => \@crumbs, - 'bread_crumbs_nomenu' => 1}; - # Create the nav map my $navmap = Apache::lonnavmaps::navmap->new(); if (ref($navmap)) { # renderer call if (&Apache::lonnet::is_on_map($requrl)) { - @crumbs = ({text => $crstype.' Contents', - href => "javascript:gopost('/adm/navmaps','')"}); - my $res = $navmap->getResourceByUrl($mapurl); - if (ref($res)) { - my $symb = $res->symb(); - if ($symb) { - my ($parent) = &Apache::lonnet::decode_symb($res->symb()); - if ($parent ne $env{'course.'.$env{'request.course.id'}.'.url'}) { - my @mapcrumbs = $navmap->recursed_crumbs($parent); - if (@mapcrumbs) { - push(@crumbs,@mapcrumbs); + my ($ltiscope,$ltiuri); + if (($env{'request.lti.login'}) && ($env{'request.lti.uri'})) { + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + ($ltiscope,$ltiuri) = &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},$cdom,$cnum); + } + my $mapurl = &Apache::lonnet::declutter($requrl); + my @crumbs; + unless ($ltiscope eq 'resource') { + unless ($ltiscope eq 'map') { + @crumbs = ({text => $crstype.' Contents', + href => "javascript:gopost('/adm/navmaps','')"}); + } + my $res = $navmap->getResourceByUrl($mapurl); + if (ref($res)) { + my $symb = $res->symb(); + if ($symb) { + my ($parent) = &Apache::lonnet::decode_symb($res->symb()); + if (($parent ne $env{'course.'.$env{'request.course.id'}.'.url'}) && + !(($ltiscope eq 'map') && ($requrl eq $ltiuri))) { + my @mapcrumbs = $navmap->recursed_crumbs($parent); + if (@mapcrumbs) { + push(@crumbs,@mapcrumbs); + } } + $env{'request.symb'} = $symb; } - $env{'request.symb'} = $symb; } } + my $maptitle = &Apache::lonnet::gettitle($mapurl); push(@crumbs,{text => $maptitle, no_mt => 1}); - $args = {'bread_crumbs' => \@crumbs, - 'bread_crumbs_nomenu' => 1, - 'no_auto_mt_title' => 1}; + my $args = {'bread_crumbs' => \@crumbs, + 'bread_crumbs_nomenu' => 1}; + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + $r->print(&Apache::loncommon::start_page($maptitle,undef,$args)); my $renderArgs = { 'cols' => [0,1,2,3], @@ -299,27 +307,14 @@ sub handler { # If no resources were found let the user know. if ($renderArgs->{'counter'} == 0) { - $r->print('

'. - &mt('No items found in folder'). - '

'); + $r->print("

". + &mt("This folder is empty.")."

"); } $r->print(&Apache::loncommon::end_page()); - } else { - $r->print(&Apache::loncommon::start_page($maptitle,undef,$args). - '

'. - &mt('Folder no longer appears to be a part of the course'). - '

'. - &Apache::loncommon::end_page()); + $r->rflush(); + return OK; } - } else { - $r->print(&Apache::loncommon::start_page($maptitle,undef,$args). - '

'. - &mt('Error: could not determine contents of folder'). - '

'. - &Apache::loncommon::end_page()); } - $r->rflush(); - return OK; } } @@ -405,12 +400,8 @@ sub handler { if ($is_encrypted) { $showdisurl = &Apache::lonenc::encrypted($disurl); } - if ($disurl =~ m{^/adm/navmaps(\?|$)}) { - &Apache::lonnet::symblist($requrl,$disurl => [$disurl,$dismapid]); - } else { - &Apache::lonnet::symblist($requrl,$disurl => [$disurl,$dismapid], - 'last_known' => [$disurl,$dismapid]); - } + &Apache::lonnet::symblist($requrl,$disurl => [$disurl,$dismapid], + 'last_known' => [$disurl,$dismapid]); &Apache::loncommon::content_type($r,'text/html'); $r->header_out(Location => &Apache::lonnet::absolute_url($ENV{'SERVER_NAME'}). $showdisurl);