--- loncom/interface/lonmenu.pm	2023/07/06 19:16:16	1.369.2.83.2.8
+++ loncom/interface/lonmenu.pm	2022/03/25 21:25:37	1.369.2.83.4.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.83.2.8 2023/07/06 19:16:16 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.83.4.1 2022/03/25 21:25:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -99,7 +99,7 @@ It gets filled in the BEGIN block of thi
 
 =over
 
-=item prep_menuitems(\@menuitem,$target,$listclass,$linkattr)
+=item prep_menuitems(\@menuitem)
 
 This routine wraps a menuitem in proper HTML. It is used by primary_menu() and 
 secondary_menu().
@@ -240,9 +240,9 @@ use vars qw(@desklines %category_names %
 my @inlineremote;
 
 sub prep_menuitem {
-    my ($menuitem,$target,$listclass,$linkattr) = @_;
+    my ($menuitem,$listclass,$linkattr) = @_;
     return '' unless(ref($menuitem) eq 'ARRAY');
-    my ($link,$targetattr);
+    my $link;
     if ($$menuitem[1]) { # graphical Link
         $link = "<img class=\"LC_noBorder\""
               . " src=\"" . &Apache::loncommon::lonhttpdurl($$menuitem[1]) . "\"" 
@@ -250,13 +250,10 @@ sub prep_menuitem {
     } else {             # textual Link
         $link = &mt($$menuitem[3]);
     }
-    if ($target ne '') {
-        $targetattr = ' target="'.$target.'"';
-    }
     return ($listclass?'<li class="'.$listclass.'">':'<li>').'<a'
            # highlighting for new messages
            . ( $$menuitem[4] eq 'newmsg' ? ' class="LC_new_message"' : '') 
-           . qq| href="$$menuitem[0]"$targetattr $linkattr>$link</a></li>|;
+           . qq| href="$$menuitem[0]" target="_top" $linkattr>$link</a></li>|;
 }
 
 # primary_menu() evaluates @primary_menu and returns a two item array,
@@ -266,8 +263,8 @@ sub prep_menuitem {
 # @primary_menu is filled within the BEGIN block of this module with 
 # entries from mydesk.tab
 sub primary_menu {
-    my ($crstype,$ltimenu,$menucoll,$menuref,$links_disabled,$links_target) = @_;
-    my (%menu,%ltiexc,%menuopts);
+    my ($links_disabled) = @_;
+    my %menu;
     # each element of @primary contains following array:
     # (link url, icon path, alt text, link text, condition, position)
     my $public;
@@ -275,41 +272,6 @@ sub primary_menu {
         || (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) {
         $public = 1;
     }
-    my $lti;
-    if ($env{'request.lti.login'}) {
-        $lti = 1;
-        if (ref($ltimenu) eq 'HASH') {
-            foreach my $item ('fullname','logout') {
-                unless ($ltimenu->{$item}) {
-                    $ltiexc{$item} = 1;
-                }
-            }
-        }
-    }
-    my ($listclass,$linkattr,$target);
-    if ($links_disabled) {
-        $listclass = 'LCisDisabled';
-        $linkattr = 'aria-disabled="true"';
-    }
-    if ($links_target ne '') {
-        $target = $links_target;
-    } else {    
-        my ($ltitarget,$deeplinktarget);
-        if ($env{'request.lti.login'}) {
-             $ltitarget = $env{'request.lti.target'};
-        }
-        if ($env{'request.deeplink.login'}) {
-            $deeplinktarget = $env{'request.deeplink.target'};
-        }
-        if (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) {
-            $target = '_self';
-        } else {
-            $target = '_top';
-        }
-    }
-    if (($menucoll) && (ref($menuref) eq 'HASH')) {
-        %menuopts = %{$menuref};
-    }
     foreach my $menuitem (@primary_menu) {
         # evaluate conditions 
         next if    ref($menuitem)       ne 'ARRAY';    #
@@ -324,41 +286,25 @@ sub primary_menu {
                 && !$public;                           # only visible to public
                                                        # users
         next if    $$menuitem[4]        eq 'roles'     ##show links depending on
-                && (&Apache::loncommon::show_course()  ##term 'Courses' or 
-                || $lti);                              ##'Roles' wanted
-        next if    $$menuitem[4]        eq 'courses'   ##and not LTI access
-                && (!&Apache::loncommon::show_course()
-                || $lti);
-        next if    $$menuitem[4]        eq 'notlti'
-                && $lti;
-        next if    $$menuitem[4]        eq 'ltiexc'
-                && exists($ltiexc{lc($menuitem->[3])});
+                && &Apache::loncommon::show_course();  ##term 'Courses' or 
+        next if    $$menuitem[4]        eq 'courses'   ##'Roles' wanted
+                && !&Apache::loncommon::show_course(); ##
+        
         my $title = $menuitem->[3];
         my $position = $menuitem->[5];
         if ($position eq '') {
             $position = 'right';
         }
-        if ($env{'request.course.id'} && $menucoll) {
-            if (($menuitem->[6]) && (!$menuopts{$menuitem->[6]})) {
-                if ($menuitem->[6] eq 'pers') {
-                    if ($menuopts{'name'} && !$ltiexc{'fullname'} &&
-                        $env{'user.name'} && $env{'user.domain'}) {
-                        $menu{$position} .= '<li><a href="#">'.
-                            &Apache::loncommon::plainname($env{'user.name'},
-                                                          $env{'user.domain'}).'</a></li>';
-                        next;
-                    } else {
-                        next;
-                    }
-                } else {
-                    next;
-                }
-            }
+        my ($listclass,$linkattr);
+        if ($links_disabled) {
+            $listclass = 'LCisDisabled';
+            $linkattr = 'aria-disabled="true"';
         }
         if (defined($primary_submenu{$title})) {
-            my $link;
+            my ($link,$target);
             if ($menuitem->[0] ne '') {
                 $link = $menuitem->[0];
+                $target = '_top';
             } else {
                 $link = '#';
             }
@@ -370,30 +316,18 @@ sub primary_menu {
                              ($item->[2] eq 'blog')) && 
                              (!&Apache::lonnet::usertools_access('','',$item->[2],
                                                            undef,'tools')));
-                    if ($env{'request.course.id'} && $menucoll) {
-                        next if ($item->[3]) && (!$menuopts{$item->[3]});
-                    }
                     push(@primsub,$item);
                 }
-                if ($title eq 'Personal') {
-                    if ($env{'user.name'} && $env{'user.domain'} && !$ltiexc{'fullname'}) {
-                        unless (($env{'request.course.id'}) && ($menucoll) && (!$menuopts{'name'})) {
-                            $title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
-                        }
-                    }
-                    next if (($env{'request.course.id'}) && ($menucoll) && ($title eq 'Personal') &&
-                             (!@primsub));
-                    if ($title eq 'Personal') {
+                if (@primsub > 0) {
+                    if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'} ) {
+                        $title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
+                    } else {
                         $title = &mt($title);
                     }
-                } else {
-                    $title = &mt($title);
-                }
-                if (@primsub > 0) {
                     $menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1,undef,$listclass,$linkattr);
                 } elsif ($link) {
                     $menu{$position} .= ($listclass?'<li class="'.$listclass.'">':'<li>').
-                                        '<a href="'.$link.'" target="'.$target.'" '.$linkattr.'>'.$title.'</a></li>';
+                                        '<a href="'.$link.'" target="'.$target.'" '.$linkattr.'>'.&mt($title).'</a></li>';
                 }
             }
         } elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink
@@ -404,7 +338,7 @@ sub primary_menu {
                                                                   'helpdeskmail',
                                                                   $defdom,$origmail);
                 if ($to ne '') {
-                    $menu{$position} .= &prep_menuitem($menuitem,$target,$listclass,$linkattr); 
+                    $menu{$position} .= &prep_menuitem($menuitem,$listclass,$linkattr); 
                 }
             } else {
                 $menu{$position} .= ($listclass?'<li class="'.$listclass.'">':'<li>').
@@ -417,9 +351,9 @@ sub primary_menu {
                     $$menuitem[0] = '/adm/login';
                 }
             }
-            $menu{$position} .= prep_menuitem($menuitem,$target,$listclass,$linkattr);
+            $menu{$position} .= prep_menuitem($menuitem,$listclass,$linkattr);
         } else {
-            $menu{$position} .= prep_menuitem($menuitem,$target,$listclass,$linkattr);
+            $menu{$position} .= prep_menuitem($menuitem,$listclass,$linkattr);
         }
     }
     my @output = ('','');
@@ -458,8 +392,7 @@ sub getauthor{
 }
 
 sub secondary_menu {
-    my ($httphost,$ltiscope,$ltimenu,$noprimary,$menucoll,$menuref,
-        $links_disabled,$links_target) = @_;
+    my ($httphost,$links_disabled) = @_;
     my $menu;
 
     my $crstype = &Apache::loncommon::course_type();
@@ -480,11 +413,9 @@ sub secondary_menu {
     my $canmodpara    = &Apache::lonnet::allowed('opa', $crs_sec);
     my $canvgr        = &Apache::lonnet::allowed('vgr', $crs_sec);
     my $canmgr        = &Apache::lonnet::allowed('mgr', $crs_sec);
-    my $canplc        = &Apache::lonnet::allowed('plc', $crs_sec);
     my $author        = &getauthor();
 
-    my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv,$grouptools,
-        $lti,$ltimapres,%ltiexc,%menuopts);
+    my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv,$grouptools);
     $grouptools = 0; 
     if ($env{'request.course.id'}) {
         $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -518,25 +449,9 @@ sub secondary_menu {
                 }
             }
         }
-        if ($env{'request.lti.login'}) {
-            $lti = 1;
-            if (ref($ltimenu) eq 'HASH') {
-                foreach my $item ('fullname','coursetitle','role','logout','grades') {
-                    unless ($ltimenu->{$item}) {
-                        $ltiexc{$item} = 1;
-                    }
-                }
-            }
-            if (($ltiscope eq 'map') || ($ltiscope eq 'resource')) {
-                $ltimapres = 1;
-            }
-        }
-    }
-    if (($menucoll) && (ref($menuref) eq 'HASH')) {
-        %menuopts = %{$menuref};
     }
 
-    my ($listclass,$linkattr,$target);
+    my ($listclass,$linkattr);
     if ($links_disabled) {
         $listclass = 'LCisDisabled';
         $linkattr = 'aria-disabled="true"';
@@ -552,22 +467,6 @@ sub secondary_menu {
     }
 
     my ($roleswitcher_js,$roleswitcher_form);
-    if ($links_target ne '') {
-        $target = $links_target;
-    } else {
-        my ($ltitarget,$deeplinktarget);
-        if ($env{'request.lti.login'}) {
-            $ltitarget = $env{'request.lti.target'};
-        }
-        if ($env{'request.deeplink.login'}) {
-            $deeplinktarget = $env{'request.deeplink.target'};
-        }
-        if (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) {
-            $target = '_self';
-        } else {
-            $target = '_top';
-        }
-    }
 
     foreach my $menuitem (@secondary_menu) {
         # evaluate conditions 
@@ -582,7 +481,7 @@ sub secondary_menu {
         next if    $$menuitem[4]  eq 'crseditCommunity'
                 && ($crstype eq 'Course');
         next if    $$menuitem[4]  eq 'nvgr'
-                && ($canvgr || $ltiexc{'grades'});
+                && $canvgr;
         next if    $$menuitem[4]  eq 'vgr'
                 && !$canvgr;
         next if    $$menuitem[4]   eq 'viewusers'
@@ -603,33 +502,17 @@ sub secondary_menu {
                 && !$showsyllabus;
         next if    $$menuitem[4]   eq 'showfeeds'
                 && !$showfeeds;
-        next if     $$menuitem[4]  eq 'plc'
-                && !$canplc;
         next if    $$menuitem[4]    eq 'author'
                 && !$author;
         next if    $$menuitem[4]    eq 'cca'
                 && !$canmodifycoauthor;
-        next if    $$menuitem[4]    eq 'notltimapres'
-                && $ltimapres;
-        next if    $$menuitem[4]    eq 'notlti'
-                && $lti;
-        next if    $$menuitem[4]    eq 'lti'
-                && (!$lti || !$noprimary);
-        next if    $$menuitem[3]    eq 'Logout'
-                && $ltiexc{'logout'};
 
         my $title = $menuitem->[3];
-        if ($env{'request.course.id'} && $menucoll) {
-            if ($$menuitem[5] eq 'main') {
-                next if ($menuopts{$$menuitem[5]} eq 'n');
-            } elsif ($$menuitem[5] ne 'roles') {
-                next if (($$menuitem[5]) && (!$menuopts{$$menuitem[5]}));
-            }
-        }
         if (defined($secondary_submenu{$title})) {
-            my $link;
+            my ($link,$target);
             if ($menuitem->[0] ne '') {
                 $link = $menuitem->[0];
+                $target = '_top';
             } else {
                 $link = '#';
             }
@@ -647,21 +530,9 @@ sub secondary_menu {
                         next if ($item->[2] eq 'params' && !$canmodpara && !$canviewpara);
                         next if ($item->[2] eq 'author' && !$author);
                         next if ($item->[2] eq 'cca' && !$canmodifycoauthor);
-                        next if ($item->[2] eq 'lti' && !$lti);
-                        if ($item->[2] =~ /^lti(portfolio|wishlist|blog)$/) {
-                            my $tool = $1;
-                            next if !$lti;
-                            next if (!&Apache::lonnet::usertools_access('','',$tool,
-                                                                        undef,'tools'));
-                        }
                         push(@scndsub,$item); 
                     }
                 }
-                if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'}) {
-                    unless ($ltiexc{'fullname'}) {
-                        $title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
-                    }
-                }
                 if (@scndsub > 0) {
                     $menu .= &create_submenu($link,$target,&mt($title),\@scndsub,1,undef,
                                              $listclass,$linkattr);
@@ -673,16 +544,12 @@ sub secondary_menu {
             }
         } elsif ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {
             # special treatment for role selector
-            my ($switcher,$has_opa_priv);
-            ($roleswitcher_js,$roleswitcher_form,$switcher,$has_opa_priv) =
+            ($roleswitcher_js,$roleswitcher_form,my $switcher) =
                 &roles_selector(
                         $env{'course.' . $env{'request.course.id'} . '.domain'},
                         $env{'course.' . $env{'request.course.id'} . '.num'},
-                        $httphost,$target,$menucoll,$menuref
+                        $httphost
                 );
-            if (($$menuitem[5]) && (!$menuopts{$$menuitem[5]})) {
-                next unless ($has_opa_priv);
-            }
             $menu .= $switcher;
         } else {
             if ($$menuitem[3] eq 'Syllabus' && $env{'request.course.id'}) {
@@ -709,7 +576,7 @@ sub secondary_menu {
                 }
                 $$menuitem[0] = &HTML::Entities::encode($$menuitem[0],'&<>"');
             }
-            $menu .= &prep_menuitem(\@$menuitem,$target,$listclass,$linkattr);
+            $menu .= &prep_menuitem(\@$menuitem,$listclass,$linkattr);
         }
     }
     if ($menu =~ /\[url\].*\[symb\]/) {
@@ -732,7 +599,6 @@ sub secondary_menu {
     }
     $menu =~ s/\[uname\]/$$author{user}/g;
     $menu =~ s/\[udom\]/$$author{dom}/g;
-    $menu =~ s/\[javascript\]/javascript:/g;
     if ($env{'request.course.id'}) {  
         $menu =~ s/\[cnum\]/$cnum/g;
         $menu =~ s/\[cdom\]/$cdom/g;
@@ -749,12 +615,12 @@ sub secondary_menu {
 sub create_submenu {
     my ($link,$target,$title,$submenu,$translate,$addclass,$listclass,$linkattr) = @_;
     return unless (ref($submenu) eq 'ARRAY');
-    my $targetattr;
-    if (($target ne '') && ($link ne '#')) {
-        $targetattr = ' target="'.$target.'"';
+    my $disptarget;
+    if ($target ne '') {
+        $disptarget = ' target="'.$target.'"';
     }
     my $menu = '<li class="LC_hoverable '.$addclass.'">'.
-               '<a href="'.$link.'"'.$targetattr.'>'.
+               '<a href="'.$link.'"'.$disptarget.'>'.
                '<span class="LC_nobreak">'.$title.
                '<span class="LC_fontsize_small" style="font-weight:normal;">'.
                ' &#9660;</span></span></a>'.
@@ -831,17 +697,14 @@ sub build_submenu {
                     }
                     $href =~ s/\[returnurl\]/$returnurl/;
                 }
-                my $targetattr;
                 unless (($href eq '') || ($href =~ /^\#/)) {
-                    if ($target ne '') {
-                        $targetattr = ' target="'.$target.'"';
-                    }
+                    $target = ' target="_top"';
                 }
 
                 $menu .= '<li ';
                 $menu .= ($listclass?'class="'.$listclass.'" ':'');
                 $menu .= 'style="margin:0;padding:0;'. $bordertop . $borderbot .'">';
-                $menu .= '<a href="'.$href.'"'.$targetattr.' '.$linkattr.'>' .  $title . '</a>';
+                $menu .= '<a href="'.$href.'"'.$target.' '.$linkattr.'>' .  $title . '</a>';
                 $menu .= '</li>';
             }
         }
@@ -878,8 +741,7 @@ sub registerurl {
 }
 
 sub innerregister {
-    my ($forcereg,$bread_crumbs,$group,$pagebuttonshide,$hostname,
-        $ltiscope,$ltiuri,$showncrumbsref) = @_;
+    my ($forcereg,$bread_crumbs,$group,$pagebuttonshide,$hostname) = @_;
     my $const_space = ($env{'request.state'} eq 'construct');
     my $is_const_dir = 0;
 
@@ -920,33 +782,30 @@ sub innerregister {
             my $restitle = &Apache::lonnet::gettitle($symb);
 
             my (@crumbs,@mapcrumbs);
-            if (($env{'request.noversionuri'} ne '/adm/navmaps') && ($mapurl ne '')) { 
-                unless ($ltiscope eq 'resource') {
-                    if (($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) &&
-                        !(($ltiscope eq 'map') && (&Apache::lonnet::clutter($resurl) eq $ltiuri))) {
-                        $navmap = Apache::lonnavmaps::navmap->new();
-                        if (ref($navmap)) {
-                            @mapcrumbs = $navmap->recursed_crumbs($mapurl,$restitle);
-                        }
-                    }
+            if (($env{'request.noversionuri'} ne '/adm/navmaps') && ($mapurl ne '') &&
+                ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'})) {
+                $navmap = Apache::lonnavmaps::navmap->new();
+                if (ref($navmap)) {
+                    @mapcrumbs = $navmap->recursed_crumbs($mapurl,$restitle);
                 }
             }
-            unless (($ltiscope eq 'map') || ($ltiscope eq 'resource')) {
+            unless (($forcereg) && 
+                    ($env{'request.noversionuri'} eq '/adm/navmaps') &&
+                    ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
                 @crumbs = ({text  => $crstype.' Contents', 
                             href  => "Javascript:gopost('/adm/navmaps','')"});
             }
             if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { 
                 if (@mapcrumbs) {
                     push(@crumbs,@mapcrumbs);
-                } elsif (($ltiscope ne 'map') && ($ltiscope ne 'resource')) {
+                } else {
                     push(@crumbs, {text  => '...',
                                    no_mt => 1});
                 }
             }
 
             unless ((@mapcrumbs) || (!$maptitle) || ($maptitle eq 'default.sequence') ||
-                    ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) ||
-                    ($ltiscope eq 'resource')) { 
+                    ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
                 push @crumbs, {text => $maptitle, no_mt => 1,
                                href => &Apache::lonnet::clutter($mapurl).'?navmap=1'};
             }
@@ -975,39 +834,27 @@ sub innerregister {
                 if ($env{'form.title'}) {
                     $title = $env{'form.title'};
                 }
-                my ($trail,$cnum,$cdom);
-                if ($env{'form.folderpath'}) {
-                    $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-                    $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-                    &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom);
-                }
+                my $trail;
                 if ($env{'form.folderpath'}) {
                     &prepare_functions($resurl,$forcereg,$group,undef,undef,1,$hostname);
-                    $title = &HTML::Entities::encode($title,'\'"<>&');
                     ($trail) =
-                        &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1);
+                        &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
                 } else {
                     &Apache::lonhtmlcommon::add_breadcrumb(
                     {text  => "Supplemental $crstype Content",
                      href  => "javascript:gopost('/adm/supplemental','')"});
-                    $title = &HTML::Entities::encode(&mt('View Resource'),'\'"<>&');
+                    $title = &mt('View Resource');
                     ($trail) =
-                        &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1);
-                }
-                if (ref($showncrumbsref)) {
-                    $$showncrumbsref = 1;
+                        &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
                 }
                 return $trail;
             } elsif ($resurl =~ m{^\Q/uploaded$courseurl/portfolio/syllabus/}) {
                 &Apache::lonhtmlcommon::clear_breadcrumbs();
                 &prepare_functions('/public'.$courseurl."/syllabus",
                                    $forcereg,$group,undef,undef,1,$hostname);
-                $title = &HTML::Entities::encode(&mt('Syllabus File'),'\'"<>&');  
+                $title = &mt('Syllabus File');
                 my ($trail) =
-                    &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1);
-                if (ref($showncrumbsref)) {
-                    $$showncrumbsref = 1;
-                }
+                    &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,$hostname);
                 return $trail;
             }
             unless ($env{'request.state'} eq 'construct') {
@@ -1059,14 +906,8 @@ sub innerregister {
             $perms{'mdc'} = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
             $perms{'cev'} = &Apache::lonnet::allowed('cev',$env{'request.course.id'});
             my @privs;
-            my $gradable_exttool;
             if ($env{'request.symb'} ne '') {
-                if ($env{'request.noversionuri'} =~ m{^/adm/$cdom/$cnum/(\d+)/ext\.tool$}) {
-                    if (&Apache::lonnet::EXT('resource.0.gradable') =~ /^yes$/i) {
-                        $gradable_exttool = 1;
-                         push(@privs,('mgr','vgr'));
-                    }
-                } elsif ($env{'request.filename'}=~/$LONCAPA::assess_re/) {
+                if ($env{'request.filename'}=~/$LONCAPA::assess_re/) {
                     push(@privs,('mgr','vgr'));
                 }
                 push(@privs,('opa','vpa'));
@@ -1167,42 +1008,13 @@ ENDMENUITEMS
 # We are in a course and looking at a registered URL
 # Should probably be in mydesk.tab
 #
-            $menuitems = "c&3&1";
-            if ($ltiscope eq 'resource') {
-# Suppress display of backward arrow for LTI Provider if scope is resource.
-# Suppress display of forward arrow for LTI Provider if scope is resource.
-            } elsif ($ltiscope eq 'map') {
-# Suppress display of backward arrow for LTI Provider if scope is map and this is first resource.
-# Suppress display of forward arrow for LTI Provider if scope is map and this is the last resource.
-                my $showforw = 1;
-                my $showback = 1;
-                my $navmap = Apache::lonnavmaps::navmap->new();
-                if (ref($navmap)) {
-                    my $mapres = $navmap->getResourceByUrl($ltiuri);
-                    if (ref($mapres)) {
-                        if ($navmap->isLastResource($mapres,$env{'request.symb'})) {
-                            $showforw = 0;
-                        }
-                        if ($navmap->isFirstResource($mapres,$env{'request.symb'})) {
-                            $showback = 0;
-                        }
-                    }
-                }
-                if ($showback) {
-                    $menuitems.="
-s&2&1&back.png&&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1";
-                }
-                if ($showforw) {
-                    $menuitems.="
-s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3";
-                }
-            } else {
-                $menuitems.="
-s&2&1&back.png&&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1
-s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3";
-            }
-            $menuitems .= (<<ENDMENUITEMS);
+
+	    $menuitems=(<<ENDMENUITEMS);
+c&3&1
+s&2&1&back.png&$swtext{'back'}&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1
+s&2&3&forw.png&$swtext{'forw'}&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3
 c&6&3
+c&8&1
 c&8&2
 s&8&3&prt.png&$swtext{'prt'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS
@@ -1235,15 +1047,13 @@ if ($env{'browser.mobile'}) {
 
             unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {
 		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) &&
-                    ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/(docs/|default_\d+\.page$)}) &&
-                    ($env{'request.noversionuri'} !~ m{^/adm/.+/ext\.tool$})) {
+                     ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/(docs/|default_\d+\.page$)})) {
 		    $menuitems.=(<<ENDREALRES);
-s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info(currentURL,'$is_mobile')&Show Metadata
+s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info('$is_mobile')&Show Metadata
 ENDREALRES
                 }
                 unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/(docs/|default_\d+\.page$)}) ||
-                        ($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext|uploaded)/}) ||
-                        ($env{'request.noversionuri'} =~ m{^/adm/.+/ext\.tool$})) { 
+                        ($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext|uploaded)/})) { 
 	            $menuitems.=(<<ENDREALRES);
 s&8&1&eval.png&$swtext{'eval'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
 ENDREALRES
@@ -1300,10 +1110,6 @@ ENDMENUITEMS
                 }
             }
         }
-        my $linkprotout;
-        if ($env{'request.deeplink.login'}) {
-            $linkprotout = &linkprot_exit();
-        }
         if ($noremote) {
 	    my $addremote=0;
 	    foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
@@ -1329,17 +1135,11 @@ ENDMENUITEMS
                     if ($countdown) {
                         &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown);
                     }
-                    if ($linkprotout) {
-                        &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout);
-                    }
                 } else {
                     my @tools = @inlineremote[93,91,81,82,83];
                     if ($countdown) {
                         unshift(@tools,$countdown);
                     }
-                    if ($linkprotout) {
-                        unshift(@tools,$linkprotout);
-                    }
                     &Apache::lonhtmlcommon::add_breadcrumb_tool(
                         'tools',@tools);
 
@@ -1353,10 +1153,6 @@ ENDMENUITEMS
                     }
                     &advtools_crumbs(@inlineremote);
                 }
-            } else {
-                if ($linkprotout) {
-                    &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout);
-                }
             }
             my ($topic_help,$topic_help_text);
             if ($is_const_dir == 2) {
@@ -1368,9 +1164,6 @@ ENDMENUITEMS
                     $topic_help_text = 'About WebDAV access';
                 }
             }
-            if (ref($showncrumbsref)) {
-                $$showncrumbsref = 1;
-            }
             return   &Apache::lonhtmlcommon::scripttag('', 'start')
                    . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'','','','',$topic_help,$topic_help_text)
                    . &Apache::lonhtmlcommon::scripttag('', 'end');
@@ -1705,12 +1498,8 @@ sub get_editbutton {
         if ($env{'form.folderpath'}) {
             $suppanchor = $env{'form.anchor'};
         }
-        my $shownsymb;
-        if ($env{'request.symb'}) {
-            $shownsymb = &Apache::lonenc::check_encrypt($env{'request.symb'});
-        }
         $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
-                                                $forceedit,$forcereg,$env{'request.symb'},$shownsymb,
+                                                $forceedit,$forcereg,$env{'request.symb'},
                                                 &escape($env{'form.folderpath'}),
                                                 &escape($env{'form.title'}),$hostname,
                                                 $env{'form.idx'},&escape($env{'form.suppurl'}),
@@ -1926,7 +1715,6 @@ sub prepare_functions {
         if (($env{'form.folderpath'} =~ /^supplemental/) &&
             (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
             (($resurl =~ m{^/adm/wrapper/ext/}) ||
-             ($resurl =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}) ||
              ($resurl =~ m{^/uploaded/$cdom/$cnum/supplemental/}) ||
              ($resurl eq '/adm/supplemental') ||
              ($resurl =~ m{^/public/$cdom/$cnum/syllabus$}) ||
@@ -2071,8 +1859,7 @@ sub switch {
         unless ($env{'request.state'} eq 'construct') {
             push(@tools,63);
         }
-        if ((($env{'environment.icons'} eq 'iconsonly') ||
-             ($env{'environment.icons'} eq '') && ($env{'request.lti.login'})) &&
+        if (($env{'environment.icons'} eq 'iconsonly') &&
             (grep(/^$idx$/,@tools))) {
             $inlineremote[$idx] =
         '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.'</a>';
@@ -2692,14 +2479,6 @@ sub utilityfunctions {
 
     my $countdown = &countdown_toggle_js();
 
-    my ($ltitarget,$deeplinktarget);
-    if ($env{'request.lti.login'}) {
-        $ltitarget = $env{'request.lti.target'};
-    }
-    if ($env{'request.deeplink.login'}) {
-        $deeplinktarget = $env{'request.deeplink.target'};
-    }
-
     my $annotateurl = '/adm/annotation';
     if ($httphost) {
         $annotateurl = '/adm/annotations';
@@ -2800,23 +2579,17 @@ function golist(url) {
        currentURL = null;
        currentSymb= null;
        var lcHostname = setLCHost();
-       var ltitarget = '$ltitarget';
-       var deeplinktarget = '$deeplinktarget';
-       if ((ltitarget == 'iframe') || (deeplinktarget == '_self')) {
-           document.location.href=lcHostname+url;
-       } else {
-           top.location.href=lcHostname+url;
-       }
+       top.location.href=lcHostname+url;
    }
 }
 
 
 
-function catalog_info(url,isMobile) {
+function catalog_info(isMobile) {
     if (isMobile == 1) {
-        openMyModal(url+'.meta?modal=1',500,400,'yes');
+        openMyModal(window.location.pathname+'.meta?modal=1',500,400,'yes');
     } else {
-        loncatinfo=window.open(url+'.meta',"LONcatInfo",'height=500,width=400,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+        loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=500,width=400,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
     }
 }
 
@@ -2864,17 +2637,6 @@ function open_source() {
                          'height=500,width=600,resizable=yes,location=no,menubar=no,toolbar=no,scrollbars=yes');
 }
 
-function open_aboutLC() {
-    var isMobile = "$env{'browser.mobile'}";
-    var url = '/adm/about.html';
-    if (isMobile == 1) {
-        openMyModal(url,600,400,'yes');
-    } else {
-        window.open(url,"aboutLONCAPA","height=400,width=600,scrollbars=1,resizable=1,menubar=0,location=1");
-    }
-    return;
-}
-
 (function (\$) {
   \$(document).ready(function () {
     \$.single=function(a){return function(b){a[0]=b;return a}}(\$([1]));
@@ -2895,14 +2657,8 @@ ENDUTILITY
 }
 
 sub serverform {
-    my $target;
-    if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
-        $target = ' target="_self"';
-    } else {
-        $target = ' target="_top"';
-    }
     return(<<ENDSERVERFORM);
-<form name="server" action="/adm/logout" method="post"$target>
+<form name="server" action="/adm/logout" method="post" target="_top">
 <input type="hidden" name="postdata" value="none" />
 <input type="hidden" name="command" value="none" />
 <input type="hidden" name="url" value="none" />
@@ -2912,27 +2668,15 @@ ENDSERVERFORM
 }
 
 sub constspaceform {
-    my ($frameset) = @_;
-    my ($target,$printtarget);
-    if ($frameset) {
-        $target = ' target="_parent"';
-        $printtarget = ' target="_parent"';
-    } else {
-        unless ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) || 
-                (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
-            $target = ' target="_top"';
-            $printtarget = ' target="_top"';
-        }
-    }
     return(<<ENDCONSTSPACEFORM);
-<form name="constspace" action="/adm/logout" method="post"$target>
+<form name="constspace" action="/adm/logout" method="post" target="_top">
 <input type="hidden" name="filename" value="" />
 </form>
-<form name="cstrdelete" action="/adm/cfile" method="post"$target>
+<form name="cstrdelete" action="/adm/cfile" method="post" target="_top">
 <input type="hidden" name="action" value="delete" /> 
 <input type="hidden" name="filename" value="" />
 </form>
-<form name="cstrprint" action="/adm/printout" method="post"$printtarget>
+<form name="cstrprint" action="/adm/printout" target="_parent" method="post">
 <input type="hidden" name="postdata" value="" />
 <input type="hidden" name="curseed" value="" />
 <input type="hidden" name="problemtype" value="" />
@@ -2962,12 +2706,12 @@ sub hidden_button_check {
 }
 
 sub roles_selector {
-    my ($cdom,$cnum,$httphost,$target,$menucoll,$menuref) = @_;
+    my ($cdom,$cnum,$httphost) = @_;
     my $crstype = &Apache::loncommon::course_type();
     my $now = time;
     my (%courseroles,%seccount,%courseprivs,%roledesc);
     my $is_cc;
-    my ($js,$form,$switcher,$has_opa_priv);
+    my ($js,$form,$switcher);
     my $ccrole;
     if ($crstype eq 'Community') {
         $ccrole = 'co';
@@ -3068,15 +2812,10 @@ sub roles_selector {
         }
     }
     if ((keys(%seccount) > 1) || ($numdiffsec > 1)) {
-        my $targetattr;
-        if ($target ne '') {
-            $targetattr = ' target="'.$target.'"';
-        }
         my @submenu;
-        $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,
-                            \%roledesc,$privref,$menucoll,$menuref);
+        $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,\%roledesc,$privref);
         $form = 
-            '<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles"'.$targetattr.'>'."\n".
+            '<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles">'."\n".
             '  <input type="hidden" name="destinationurl" value="'.
             &HTML::Entities::encode($destinationurl).'" />'."\n".
             '  <input type="hidden" name="gotorole" value="1" />'."\n".
@@ -3093,19 +2832,12 @@ sub roles_selector {
                 if ($env{'request.role'} =~ m{^\Q$role\E}) {
                     if ($seccount{$role} > 1) {
                         $include = 1;
-                    } else {
-                        if ($env{'user.priv.'.$env{'request.role'}."./$cdom/$cnum"} =~/opa\&([^\:]*)/) {
-                            $has_opa_priv = 1;
-                        }
                     }
                 } else {
                     $include = 1;
                 }
             }
             if ($include) {
-                if ($env{"user.priv.$role./$cdom/$cnum./$cdom/$cnum"} =~/opa\&([^\:]*)/) {
-                    $has_opa_priv = 1;
-                }
                 push(@submenu,['javascript:adhocRole('."'$role'".')',
                                &Apache::lonnet::plaintext($role,$crstype)]);
             }
@@ -3130,19 +2862,16 @@ sub roles_selector {
                     } else {
                         $rolename = &Apache::lonnet::plaintext($role);
                     }
-                    if ($env{"user.priv.$role./$cdom/$cnum./$cdom/$cnum"} =~/opa\&([^\:]*)/) {
-                        $has_opa_priv = 1;
-                    }
                     push(@submenu,['javascript:adhocRole('."'$role'".')',
                                    $rolename]);
                 }
             }
         }
         if (@submenu > 0) {
-            $switcher = &create_submenu('#',$target,&mt('Switch role'),\@submenu);
+            $switcher = &create_submenu('','',&mt('Switch role'),\@submenu);
         }
     }
-    return ($js,$form,$switcher,$has_opa_priv);
+    return ($js,$form,$switcher);
 }
 
 sub get_all_courseroles {
@@ -3309,8 +3038,7 @@ sub get_customadhoc_roles {
 }
 
 sub jump_to_role {
-    my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$roledesc,$privref,
-        $menucoll,$menuref) = @_;
+    my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$roledesc,$privref) = @_;
     my %lt = &Apache::lonlocal::texthash(
                 this => 'This role has section(s) associated with it.',
                 ente => 'Enter a specific section.',
@@ -3321,7 +3049,6 @@ sub jump_to_role {
                 role => 'The role you selected is not permitted to view the current page.',
                 swit => 'Switch role, but display Main Menu page instead?',
     );
-    &js_escape(\%lt);
     my $js;
     if (ref($courseroles) eq 'HASH') {
         $js = '    var secpick = new Array("'.$lt{'ente'}.'","'.$lt{'orlb'}.'");'."\n". 
@@ -3344,8 +3071,6 @@ sub jump_to_role {
         }
     }
     my $checkroles = 0;
-    my $fallback = '/adm/menu';
-    my $displaymsg = $lt{'swit'};
     if ((ref($privref) eq 'ARRAY') && (@{$privref} > 0) && (ref($courseprivs) eq 'HASH')) {
         my %disallowed;
         foreach my $role (sort(keys(%{$courseprivs}))) {
@@ -3367,22 +3092,8 @@ sub jump_to_role {
             $checkroles = 1;
             $js .= "    var disallow = new Array('".join("','",keys(%disallowed))."');\n".
                    "    var rolecheck = 1;\n";
-            if ($menucoll) {
-                if (ref($menuref) eq 'HASH') {
-                    if ($menuref->{'main'} eq 'n') {
-                        $fallback = '/adm/navmaps';
-                        if (&Apache::loncommon::course_type() eq 'Community') {
-                            $displaymsg = &mt('Switch role, but display Community Contents page instead?');
-                        } else {
-                            $displaymsg = &mt('Switch role, but display Course Contents page instead?');
-                        }
-                        &js_escape(\$displaymsg);
-                    }
-                }
-            }
         }
     }
-    &js_escape(\$fallback);
     if (!$checkroles) {
         $js .=  "    var disallow = new Array();\n".
                 "    rolecheck = 0;\n";
@@ -3405,8 +3116,8 @@ function adhocRole(newrole) {
     if (rolecheck > 0) {
         for (var i=0; i<disallow.length; i++) {
             if (disallow[i] == newrole) {
-                if (confirm("$lt{'role'}\\n$displaymsg")) {
-                    document.rolechooser.destinationurl.value = '$fallback';
+                if (confirm("$lt{'role'}\\n$lt{'swit'}")) {
+                    document.rolechooser.destinationurl.value = '/adm/menu';
                 } else {
                     return;
                 }
@@ -3496,26 +3207,16 @@ sub required_privs {
 
 sub countdown_timer {
     if (($env{'request.course.id'}) && ($env{'request.symb'} ne '') &&
-        (($env{'request.filename'}=~/$LONCAPA::assess_re/) ||
-         (($env{'request.symb'} =~ /ext\.tool$/) &&
-         (&Apache::lonnet::EXT('resource.0.gradable',$env{'request.symb'}) =~ /^yes$/i)))) {
+        ($env{'request.filename'}=~/$LONCAPA::assess_re/)) {
         my ($type,$hastimeleft,$slothastime);
         my $now = time;
         if ($env{'request.filename'} =~ /\.task$/) {
             $type = 'Task';
-        } elsif ($env{'request.symb'} =~ /ext\.tool$/) {
-            $type = 'tool';
         } else {
             $type = 'problem';
         }
-        my ($status,$accessmsg,$slot_name,$slot);
-        if ($type eq 'tool') {
-            ($status,$accessmsg,$slot_name,$slot) =
-                &Apache::lonhomework::check_slot_access('0',$type,$env{'request.symb'},['0']);
-        } else {
-            ($status,$accessmsg,$slot_name,$slot) =
-                &Apache::lonhomework::check_slot_access('0',$type);
-        }
+        my ($status,$accessmsg,$slot_name,$slot) =
+            &Apache::lonhomework::check_slot_access('0',$type);
         if ($slot_name ne '') {
             if (ref($slot) eq 'HASH') {
                 if (($slot->{'starttime'} < $now) &&
@@ -3585,94 +3286,6 @@ END
     return;
 }
 
-sub linkprot_exit {
-    if (($env{'request.course.id'}) && ($env{'request.deeplink.login'})) {
-        my ($deeplink_symb,$deeplink);
-        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        if (($cnum ne '') && ($cdom ne '')) {
-            $deeplink_symb = &Apache::loncommon::deeplink_login_symb($cnum,$cdom);
-            if ($deeplink_symb) {
-                if ($deeplink_symb =~ /\.(page|sequence)$/) {
-                    my $mapname = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($deeplink_symb))[2]);
-                    my $navmap = Apache::lonnavmaps::navmap->new();
-                    if (ref($navmap)) {
-                        $deeplink = $navmap->get_mapparam(undef,$mapname,'0.deeplink');
-                    }
-                } else {
-                    $deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$deeplink_symb);
-                }
-                if ($deeplink ne '') {
-                    my ($state,$others,$listed,$scope,$protect,$display,$target,$exit) = split(/,/,$deeplink);
-                    my %lt = &Apache::lonlocal::texthash(
-                        title    => 'Exit Tool',
-                        okdone   => 'Click "OK" to exit embedded tool',
-                        cancel   => 'Click "Cancel" to continue working.',
-                        ok       => 'OK',
-                        exit     => 'Cancel',
-                    );
-                    if ($exit) {
-                        my ($show,$text) = split(/:/,$exit);
-                        unless ($show eq 'no') {
-                            my $height = 250;
-                            my $width = 300;
-                            my $exitbuttontext;
-                            if ($text eq '') {
-                                $exitbuttontext = &mt('Exit Tool');
-                            } else {
-                                $exitbuttontext = $text;
-                            }
-                            return <<END;
-<form method="post" name="LCexitButton" action="/adm/linkexit">
-    <input type="hidden" name="LC_deeplink_exit" value="" />
-    <button id="LC_exit-confirm-opener" type="button">$exitbuttontext</button>
-</form>
-
-<div id="LC_exit-confirm" title="$lt{'title'}">
-    <p>$lt{'okdone'} $lt{'cancel'}</p>
-</div>
-
-<script type="text/javascript">
-// <![CDATA[
-\$( "#LC_exit-confirm" ).dialog({ autoOpen: false });
-\$( "#LC_exit-confirm-opener" ).click(function() {
-    \$( "#LC_exit-confirm" ).dialog( "open" );
-    \$( "#LC_exit-confirm" ).dialog({
-      resizable: false,
-      height: $height,
-      width: $width,
-      modal: true,
-      buttons: [
-                 {
-                    text: "$lt{'ok'}",
-                    click: function() {
-                        \$( this ).dialog( "close" );
-                        \$( '[name="LC_deeplink_exit"]' )[0].value = 'true';
-                        \$( '[name="LCexitButton"]' )[0].submit();
-                    },
-                 },
-                 {
-                     text: "$lt{'exit'}",
-                     click: function() {
-                         \$( this ).dialog( "close" );
-                     },
-                  },
-               ],
-       });
-});
-// ]]>
-</script>
-
-END
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return;
-}
-
 # ================================================================ Main Program
 
 BEGIN {
@@ -3689,13 +3302,13 @@ BEGIN {
                         $category_positions{$entries[2]}=$entries[1];
                         $category_names{$entries[2]}=$entries[3];
                     } elsif ($configline=~/^prim\:/) {
-                        my @entries = (split(/\:/, $configline))[1..7];
+                        my @entries = (split(/\:/, $configline))[1..6];
                         push(@primary_menu,\@entries);
                     } elsif ($configline=~/^primsub\:/) {
-                        my ($parent,@entries) = (split(/\:/, $configline))[1..5];
+                        my ($parent,@entries) = (split(/\:/, $configline))[1..4];
                         push(@{$primary_submenu{$parent}},\@entries);
                     } elsif ($configline=~/^scnd\:/) {
-                        my @entries = (split(/\:/, $configline))[1..6];
+                        my @entries = (split(/\:/, $configline))[1..5];
                         push(@secondary_menu,\@entries);
                     } elsif ($configline=~/^scndsub\:/) {
                         my ($parent,@entries) = (split(/\:/, $configline))[1..4];