--- loncom/interface/lonmenu.pm	2022/05/28 16:25:45	1.520
+++ loncom/interface/lonmenu.pm	2022/05/29 03:19:00	1.521
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.520 2022/05/28 16:25:45 raeburn Exp $
+# $Id: lonmenu.pm,v 1.521 2022/05/29 03:19:00 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,$ltitarget,$deeplinktarget,$listclass,$linkattr)
+=item prep_menuitems(\@menuitem,$target,$listclass,$linkattr)
 
 This routine wraps a menuitem in proper HTML. It is used by primary_menu() and 
 secondary_menu().
@@ -220,9 +220,9 @@ use vars qw(@desklines %category_names %
 my @inlineremote;
 
 sub prep_menuitem {
-    my ($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr) = @_;
+    my ($menuitem,$target,$listclass,$linkattr) = @_;
     return '' unless(ref($menuitem) eq 'ARRAY');
-    my $link;
+    my ($link,$targetattr);
     if ($$menuitem[1]) { # graphical Link
         $link = "<img class=\"LC_noBorder\""
               . " src=\"" . &Apache::loncommon::lonhttpdurl($$menuitem[1]) . "\"" 
@@ -230,16 +230,13 @@ sub prep_menuitem {
     } else {             # textual Link
         $link = &mt($$menuitem[3]);
     }
-    my $target = ' target="_top"';
-    if ($ltitarget eq 'iframe') {
-        $target ='';
-    } elsif ($deeplinktarget eq '_self') {
-        $target = ' target="'.$deeplinktarget.'"';
+    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]"$target $linkattr>$link</a></li>|;
+           . qq| href="$$menuitem[0]"$targetattr $linkattr>$link</a></li>|;
 }
 
 # primary_menu() evaluates @primary_menu and returns a two item array,
@@ -249,7 +246,7 @@ 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) = @_;
+    my ($crstype,$ltimenu,$menucoll,$menuref,$links_disabled,$links_target) = @_;
     my (%menu,%ltiexc,%menuopts);
     # each element of @primary contains following array:
     # (link url, icon path, alt text, link text, condition, position)
@@ -267,10 +264,9 @@ sub primary_menu {
         my %roles_in_env;
         $rolecount = &Apache::lonroles::roles_from_env(\%roles_in_env,$update);
     }
-    my ($lti,$ltitarget,$deeplinktarget);
+    my $lti;
     if ($env{'request.lti.login'}) {
         $lti = 1;
-        $ltitarget = $env{'request.lti.target'};
         if (ref($ltimenu) eq 'HASH') {
             foreach my $item ('fullname','logout') {
                 unless ($ltimenu->{$item}) {
@@ -279,8 +275,26 @@ sub primary_menu {
             }
         }
     }
-    if ($env{'request.deeplink.login'}) {
-        $deeplinktarget = $env{'request.deeplink.target'};
+    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};
@@ -337,18 +351,10 @@ sub primary_menu {
                 }
             }
         }
-        my ($listclass,$linkattr);
-        if ($links_disabled) {
-            $listclass = 'LCisDisabled';
-            $linkattr = 'aria-disabled="true"';
-        }
         if (defined($primary_submenu{$title})) {
-            my ($link,$target);
+            my $link;
             if ($menuitem->[0] ne '') {
                 $link = $menuitem->[0];
-                unless (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) {
-                    $target = '_top';
-                }
             } else {
                 $link = '#';
             }
@@ -396,7 +402,7 @@ sub primary_menu {
                                                                   'helpdeskmail',
                                                                   $defdom,$origmail);
                 if ($to ne '') {
-                    $menu{$position} .= &prep_menuitem($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr); 
+                    $menu{$position} .= &prep_menuitem($menuitem,$target,$listclass,$linkattr); 
                 }
             } else {
                 $menu{$position} .= ($listclass?'<li class="'.$listclass.'">':'<li>').
@@ -409,9 +415,9 @@ sub primary_menu {
                     $$menuitem[0] = '/adm/login';
                 }
             }
-            $menu{$position} .= prep_menuitem($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr);
+            $menu{$position} .= prep_menuitem($menuitem,$target,$listclass,$linkattr);
         } else {
-            $menu{$position} .= prep_menuitem($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr);
+            $menu{$position} .= prep_menuitem($menuitem,$target,$listclass,$linkattr);
         }
     }
     my @output = ('','');
@@ -450,7 +456,8 @@ sub getauthor{
 }
 
 sub secondary_menu {
-    my ($httphost,$ltiscope,$ltimenu,$noprimary,$menucoll,$menuref,$links_disabled) = @_;
+    my ($httphost,$ltiscope,$ltimenu,$noprimary,$menucoll,$menuref,
+        $links_disabled,$links_target) = @_;
     my $menu;
 
     my $crstype = &Apache::loncommon::course_type();
@@ -527,7 +534,7 @@ sub secondary_menu {
         %menuopts = %{$menuref};
     }
 
-    my ($listclass,$linkattr);
+    my ($listclass,$linkattr,$target);
     if ($links_disabled) {
         $listclass = 'LCisDisabled';
         $linkattr = 'aria-disabled="true"';
@@ -542,12 +549,22 @@ sub secondary_menu {
         }
     }
 
-    my ($roleswitcher_js,$roleswitcher_form,$ltitarget,$deeplinktarget);
-    if ($env{'request.lti.login'}) {
-        $ltitarget = $env{'request.lti.target'};
-    }
-    if ($env{'request.deeplink.login'}) {
-        $deeplinktarget = $env{'request.deeplink.target'};
+    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) {
@@ -603,12 +620,9 @@ sub secondary_menu {
             }
         }
         if (defined($secondary_submenu{$title})) {
-            my ($link,$target);
+            my $link;
             if ($menuitem->[0] ne '') {
                 $link = $menuitem->[0];
-                unless (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) {
-                    $target = '_top';
-                }
             } else {
                 $link = '#';
             }
@@ -657,7 +671,7 @@ sub secondary_menu {
                 &roles_selector(
                     $env{'course.' . $env{'request.course.id'} . '.domain'},
                     $env{'course.' . $env{'request.course.id'} . '.num'},
-                    $httphost,$menucoll,$menuref
+                    $httphost,$target,$menucoll,$menuref
                 );
             if (($$menuitem[5]) && (!$menuopts{$$menuitem[5]})) {
                 next unless ($has_opa_priv);
@@ -691,7 +705,7 @@ sub secondary_menu {
                 }
                 $$menuitem[0] = &HTML::Entities::encode($$menuitem[0],'&<>"');
             }
-            $menu .= &prep_menuitem(\@$menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr);
+            $menu .= &prep_menuitem(\@$menuitem,$target,$listclass,$linkattr);
         }
     }
     if ($menu =~ /\[url\].*\[symb\]/) {
@@ -731,12 +745,12 @@ sub secondary_menu {
 sub create_submenu {
     my ($link,$target,$title,$submenu,$translate,$addclass,$listclass,$linkattr) = @_;
     return unless (ref($submenu) eq 'ARRAY');
-    my $disptarget;
-    if ($target ne '') {
-        $disptarget = ' target="'.$target.'"';
+    my $targetattr;
+    if (($target ne '') && ($link ne '#')) {
+        $targetattr = ' target="'.$target.'"';
     }
     my $menu = '<li class="LC_hoverable '.$addclass.'">'.
-               '<a href="'.$link.'"'.$disptarget.'>'.
+               '<a href="'.$link.'"'.$targetattr.'>'.
                '<span class="LC_nobreak">'.$title.
                '<span class="LC_fontsize_small" style="font-weight:normal;">'.
                ' &#9660;</span></span></a>'.
@@ -813,16 +827,17 @@ sub build_submenu {
                     }
                     $href =~ s/\[returnurl\]/$returnurl/;
                 }
+                my $targetattr;
                 unless (($href eq '') || ($href =~ /^\#/)) {
-                    if ($target eq '_top') {
-                        $target = ' target="_top"';
+                    if ($target ne '') {
+                        $targetattr = ' target="'.$target.'"';
                     }
                 }
 
                 $menu .= '<li ';
                 $menu .= ($listclass?'class="'.$listclass.'" ':'');
                 $menu .= 'style="margin:0;padding:0;'. $bordertop . $borderbot .'">';
-                $menu .= '<a href="'.$href.'"'.$target.' '.$linkattr.'>' .  $title . '</a>';
+                $menu .= '<a href="'.$href.'"'.$targetattr.' '.$linkattr.'>' .  $title . '</a>';
                 $menu .= '</li>';
             }
         }
@@ -2490,7 +2505,7 @@ sub constspaceform {
         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="_parent"';
+            $printtarget = ' target="_top"';
         }
     }
     return(<<ENDCONSTSPACEFORM);
@@ -2526,7 +2541,7 @@ sub hidden_button_check {
 }
 
 sub roles_selector {
-    my ($cdom,$cnum,$httphost,$menucoll,$menuref) = @_;
+    my ($cdom,$cnum,$httphost,$target,$menucoll,$menuref) = @_;
     my $crstype = &Apache::loncommon::course_type();
     my $now = time;
     my (%courseroles,%seccount,%courseprivs,%roledesc);
@@ -2632,11 +2647,15 @@ 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);
         $form = 
-            '<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles">'."\n".
+            '<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles"'.$targetattr.'>'."\n".
             '  <input type="hidden" name="destinationurl" value="'.
             &HTML::Entities::encode($destinationurl).'" />'."\n".
             '  <input type="hidden" name="gotorole" value="1" />'."\n".
@@ -2699,7 +2718,7 @@ sub roles_selector {
             }
         }
         if (@submenu > 0) {
-            $switcher = &create_submenu('#','',&mt('Switch role'),\@submenu);
+            $switcher = &create_submenu('#',$target,&mt('Switch role'),\@submenu);
         }
     }
     return ($js,$form,$switcher,$has_opa_priv);