--- loncom/interface/lonmenu.pm	2022/05/06 19:36:09	1.515
+++ loncom/interface/lonmenu.pm	2022/05/24 16:23:03	1.516
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.515 2022/05/06 19:36:09 raeburn Exp $
+# $Id: lonmenu.pm,v 1.516 2022/05/24 16:23:03 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)
+=item prep_menuitems(\@menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr)
 
 This routine wraps a menuitem in proper HTML. It is used by primary_menu() and 
 secondary_menu().
@@ -220,7 +220,7 @@ use vars qw(@desklines %category_names %
 my @inlineremote;
 
 sub prep_menuitem {
-    my ($menuitem,$ltitarget,$listclass,$linkattr) = @_;
+    my ($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr) = @_;
     return '' unless(ref($menuitem) eq 'ARRAY');
     my $link;
     if ($$menuitem[1]) { # graphical Link
@@ -233,6 +233,8 @@ sub prep_menuitem {
     my $target = ' target="_top"';
     if ($ltitarget eq 'iframe') {
         $target ='';
+    } elsif ($deeplinktarget eq '_self') {
+        $target = $deeplinktarget;
     }
     return ($listclass?'<li class="'.$listclass.'">':'<li>').'<a'
            # highlighting for new messages
@@ -265,7 +267,7 @@ sub primary_menu {
         my %roles_in_env;
         $rolecount = &Apache::lonroles::roles_from_env(\%roles_in_env,$update);
     }
-    my ($lti,$ltitarget);
+    my ($lti,$ltitarget,$deeplinktarget);
     if ($env{'request.lti.login'}) {
         $lti = 1;
         $ltitarget = $env{'request.lti.target'};
@@ -277,6 +279,9 @@ sub primary_menu {
             }
         }
     }
+    if ($env{'request.deeplink.login'}) {
+        $deeplinktarget = $env{'request.deeplink.target'};
+    }
     if (($menucoll) && (ref($menuref) eq 'HASH')) {
         %menuopts = %{$menuref};
     }
@@ -341,7 +346,7 @@ sub primary_menu {
             my ($link,$target);
             if ($menuitem->[0] ne '') {
                 $link = $menuitem->[0];
-                unless ($ltitarget eq 'iframe') {
+                unless (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) {
                     $target = '_top';
                 }
             } else {
@@ -391,7 +396,7 @@ sub primary_menu {
                                                                   'helpdeskmail',
                                                                   $defdom,$origmail);
                 if ($to ne '') {
-                    $menu{$position} .= &prep_menuitem($menuitem,$ltitarget,$listclass,$linkattr); 
+                    $menu{$position} .= &prep_menuitem($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr); 
                 }
             } else {
                 $menu{$position} .= ($listclass?'<li class="'.$listclass.'">':'<li>').
@@ -404,9 +409,9 @@ sub primary_menu {
                     $$menuitem[0] = '/adm/login';
                 }
             }
-            $menu{$position} .= prep_menuitem($menuitem,$ltitarget,$listclass,$linkattr);
+            $menu{$position} .= prep_menuitem($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr);
         } else {
-            $menu{$position} .= prep_menuitem($menuitem,$ltitarget,$listclass,$linkattr);
+            $menu{$position} .= prep_menuitem($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr);
         }
     }
     my @output = ('','');
@@ -537,10 +542,13 @@ sub secondary_menu {
         }
     }
 
-    my ($roleswitcher_js,$roleswitcher_form,$ltitarget);
+    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'};
+    }
 
     foreach my $menuitem (@secondary_menu) {
         # evaluate conditions 
@@ -598,7 +606,7 @@ sub secondary_menu {
             my ($link,$target);
             if ($menuitem->[0] ne '') {
                 $link = $menuitem->[0];
-                unless ($ltitarget eq 'iframe') {
+                unless (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) {
                     $target = '_top';
                 }
             } else {
@@ -649,7 +657,7 @@ sub secondary_menu {
                 &roles_selector(
                     $env{'course.' . $env{'request.course.id'} . '.domain'},
                     $env{'course.' . $env{'request.course.id'} . '.num'},
-                    $httphost,$ltitarget
+                    $httphost
                 );
             if (($$menuitem[5]) && (!$menuopts{$$menuitem[5]})) {
                 next unless ($has_opa_priv);
@@ -683,7 +691,7 @@ sub secondary_menu {
                 }
                 $$menuitem[0] = &HTML::Entities::encode($$menuitem[0],'&<>"');
             }
-            $menu .= &prep_menuitem(\@$menuitem,$ltitarget,$listclass,$linkattr);
+            $menu .= &prep_menuitem(\@$menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr);
         }
     }
     if ($menu =~ /\[url\].*\[symb\]/) {
@@ -2235,10 +2243,13 @@ sub utilityfunctions {
 
     my $countdown = &countdown_toggle_js();
 
-    my $ltitarget;
+    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) {
@@ -2455,6 +2466,9 @@ sub serverform {
     unless (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
         $target = ' target="_top"';
     }
+    if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
+        $target = ' target="_self"';
+    }
     return(<<ENDSERVERFORM);
 <form name="server" action="/adm/logout" method="post"$target>
 <input type="hidden" name="postdata" value="none" />
@@ -2467,7 +2481,8 @@ ENDSERVERFORM
 
 sub constspaceform {
     my ($target,$printtarget);
-    unless (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
+    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"';
     }
@@ -2504,7 +2519,7 @@ sub hidden_button_check {
 }
 
 sub roles_selector {
-    my ($cdom,$cnum,$httphost,$ltitarget) = @_;
+    my ($cdom,$cnum,$httphost) = @_;
     my $crstype = &Apache::loncommon::course_type();
     my $now = time;
     my (%courseroles,%seccount,%courseprivs,%roledesc);
@@ -2676,7 +2691,7 @@ sub roles_selector {
             }
         }
         if (@submenu > 0) {
-            $switcher = &create_submenu('','',&mt('Switch role'),\@submenu,'','',$ltitarget);
+            $switcher = &create_submenu('','',&mt('Switch role'),\@submenu);
         }
     }
     return ($js,$form,$switcher,$has_opa_priv);