--- loncom/interface/lonmenu.pm	2022/05/30 15:40:15	1.369.2.83.2.3
+++ 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.3 2022/05/30 15:40:15 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,%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,27 +272,6 @@ sub primary_menu {
         || (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) {
         $public = 1;
     }
-    my ($listclass,$linkattr,$target);
-    if ($links_disabled) {
-        $listclass = 'LCisDisabled';
-        $linkattr = 'aria-disabled="true"';
-    }
-    if ($links_target ne '') {
-        $target = $links_target;
-    } else {    
-        my $deeplinktarget;
-        if ($env{'request.deeplink.login'}) {
-            $deeplinktarget = $env{'request.deeplink.target'};
-        }
-        if ($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';    #
@@ -319,27 +295,16 @@ sub primary_menu {
         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'} &&
-                        $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 = '#';
             }
@@ -351,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'}) {
-                        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
@@ -385,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>').
@@ -398,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 = ('','');
@@ -439,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();
@@ -461,10 +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,%menuopts);
+    my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv,$grouptools);
     $grouptools = 0; 
     if ($env{'request.course.id'}) {
         $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -499,11 +450,8 @@ sub secondary_menu {
             }
         }
     }
-    if (($menucoll) && (ref($menuref) eq 'HASH')) {
-        %menuopts = %{$menuref};
-    }
 
-    my ($listclass,$linkattr,$target);
+    my ($listclass,$linkattr);
     if ($links_disabled) {
         $listclass = 'LCisDisabled';
         $linkattr = 'aria-disabled="true"';
@@ -519,19 +467,6 @@ sub secondary_menu {
     }
 
     my ($roleswitcher_js,$roleswitcher_form);
-    if ($links_target ne '') {
-        $target = $links_target;
-    } else {
-        my $deeplinktarget;
-        if ($env{'request.deeplink.login'}) {
-            $deeplinktarget = $env{'request.deeplink.target'};
-        }
-        if ($deeplinktarget eq '_self') {
-            $target = '_self';
-        } else {
-            $target = '_top';
-        }
-    }
 
     foreach my $menuitem (@secondary_menu) {
         # evaluate conditions 
@@ -567,25 +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;
 
         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 = '#';
             }
@@ -617,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'}) {
@@ -653,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\]/) {
@@ -676,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;
@@ -693,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>'.
@@ -775,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>';
             }
         }
@@ -1128,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
@@ -1798,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$}) ||
@@ -2563,11 +2479,6 @@ sub utilityfunctions {
 
     my $countdown = &countdown_toggle_js();
 
-    my $deeplinktarget;
-    if ($env{'request.deeplink.login'}) {
-        $deeplinktarget = $env{'request.deeplink.target'};
-    }
-
     my $annotateurl = '/adm/annotation';
     if ($httphost) {
         $annotateurl = '/adm/annotations';
@@ -2668,22 +2579,17 @@ function golist(url) {
        currentURL = null;
        currentSymb= null;
        var lcHostname = setLCHost();
-       var deeplinktarget = '$deeplinktarget';
-       if (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');
     }
 }
 
@@ -2751,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" />
@@ -2768,26 +2668,15 @@ ENDSERVERFORM
 }
 
 sub constspaceform {
-    my ($frameset) = @_;
-    my ($target,$printtarget);
-    if ($frameset) {
-        $target = ' target="_parent"';
-        $printtarget = ' target="_parent"';
-    } else {
-        unless (($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="" />
@@ -2817,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';
@@ -2923,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".
@@ -2948,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)]);
             }
@@ -2985,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 {
@@ -3164,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.',
@@ -3176,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". 
@@ -3199,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}))) {
@@ -3222,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";
@@ -3260,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;
                 }
@@ -3446,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];