--- loncom/interface/lonmenu.pm	2023/09/28 15:56:48	1.538
+++ loncom/interface/lonmenu.pm	2023/10/02 21:01:21	1.539
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.538 2023/09/28 15:56:48 raeburn Exp $
+# $Id: lonmenu.pm,v 1.539 2023/10/02 21:01:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1081,11 +1081,30 @@ sub innerregister {
         if (($env{'request.symb'} ne '') &&
             ($env{'request.filename'}=~/$LONCAPA::assess_re/) &&
             (($perms{'mgr'}) || ($perms{'vgr'}))) {
-            my ($viewas,$text,$change,$visibility,$vuname,$vudom,$vid,$leftvis,$defdom,$righticon);
+            my ($viewas,$text,$change,$visibility,$vuname,$vudom,$vid,$leftvis,$defdom,
+                $domselector,$righticon);
             my %lt = &Apache::lonlocal::texthash(
                                                  view => 'View',
                                                  upda => 'Update',
             );
+            my $possdomstr = $env{'course.'.$env{'request.course.id'}.'.internal.userdomains'};
+            if ($possdomstr =~ /,/) {
+                my @possdoms = split(/,/,$possdomstr);
+                if ($env{'request.user_in_effect'} =~ /^$match_username:($match_domain)$/) {
+                    $defdom = $1;
+                } elsif (grep(/^\Q$cdom\E$/,@possdoms)) {
+                    $defdom = $cdom;
+                } elsif (&Apache::lonnet::domain($possdoms[0]) ne '') {
+                    $defdom = $possdoms[0];
+                }
+                $domselector = &Apache::loncommon::select_dom_form($defdom,'vudom','','','',\@possdoms);
+            } elsif (($possdomstr ne '') && (&Apache::lonnet::domain($possdomstr) ne '')) {
+                if ($env{'request.user_in_effect'} =~ /^$match_username:($match_domain)$/) {
+                    $defdom = $1;
+                } else {
+                    $defdom = $possdomstr;
+                }
+            }
             if ($env{'request.user_in_effect'} =~ /^($match_username):($match_domain)$/) {
                 ($vuname,$vudom) = ($1,$2);
                 unless (&Apache::lonnet::is_advanced_user($vudom,$vuname)) {
@@ -1103,19 +1122,29 @@ sub innerregister {
                 $change = 'on';
                 $visibility = 'none';
                 $leftvis = 'inline';
-                $defdom = $cdom;
+                if ($defdom eq '') {       
+                    $defdom = $cdom;
+                }
             }
             my $sellink = &Apache::loncommon::selectstudent_link('userview','vuname','vudom','','','vuidentifier');
             my $selscript=&Apache::loncommon::studentbrowser_javascript();
             my $shownsymb = &HTML::Entities::encode(&Apache::lonenc::check_encrypt($env{'request.symb'}),'<>&"');
-            my $input = &mt('[_1]Username:[_2] or [_3]ID:[_4] | ',
-                            '<label><input type="radio" name="vuidentifier" value="uname" checked="checked" onclick="javascript:toggleIdentifier(this.form);" />',
-                            '</label><input name="vuname" type="text" size="6" value="'.$vuname.'" id="LC_vuname" />',
-                            '<label><input type="radio" name="vuidentifier" value="uid" onclick="javascript:toggleIdentifier(this.form);" />',
-                            '</label><input name="vid" type="hidden" size="6" value="'.$vid.'" id="LC_vid" />').
-                        '<input name="vudom" type="hidden" value="'.$defdom.'" />'.
-                        '<input name="LC_viewas" type="hidden" value="'.$viewas.'" />',
-                        '<input name="symb" type="hidden" value="'.$shownsymb.'" />';
+            my $input;
+            my @items = (
+                         '<label><input type="radio" name="vuidentifier" value="uname" checked="checked" onclick="javascript:toggleIdentifier(this.form);" />',
+                         '</label><input name="vuname" type="text" size="6" value="'.$vuname.'" id="LC_vuname" />',
+                         '<label><input type="radio" name="vuidentifier" value="uid" onclick="javascript:toggleIdentifier(this.form);" />',
+                         '</label><input name="vid" type="hidden" size="6" value="'.$vid.'" id="LC_vid" />'
+                        );
+            if ($domselector) {
+                push(@items,$domselector);
+                $input = &mt('[_1]User:[_2] or [_3]ID:[_4] at [_5] | ',@items);
+            } else {
+                $input = &mt('[_1]Username:[_2] or [_3]ID:[_4] | ',@items).
+                         '<input name="vudom" type="hidden" value="'.$defdom.'" />';
+            }
+            $input .= '<input name="LC_viewas" type="hidden" value="'.$viewas.'" />',
+                      '<input name="symb" type="hidden" value="'.$shownsymb.'" />';
             my $chooser = <<END;
 $selscript
 <a href="javascript:toggleViewAsUser('$change');" class="LC_menubuttons_link">