--- loncom/interface/loncreateuser.pm	2017/08/15 23:42:33	1.406.2.14.2.1
+++ loncom/interface/loncreateuser.pm	2023/03/29 16:01:13	1.467
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.406.2.14.2.1 2017/08/15 23:42:33 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.467 2023/03/29 16:01:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,6 +71,7 @@ use Apache::longroup;
 use Apache::lonuserutils;
 use Apache::loncoursequeueadmin;
 use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities;
 
 my $loginscript; # piece of javascript used in two separate instances
 my $authformnop;
@@ -78,6 +79,7 @@ my $authformkrb;
 my $authformint;
 my $authformfsys;
 my $authformloc;
+my $authformlti;
 
 sub initialize_authen_forms {
     my ($dom,$formname,$curr_authtype,$mode) = @_;
@@ -88,7 +90,7 @@ sub initialize_authen_forms {
                   domain => $dom,
                 );
     my %abv_auth = &auth_abbrev();
-    if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix):(.*)$/) {
+    if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix|lti):(.*)$/) {
         my $long_auth = $1;
         my $curr_autharg = $2;
         my %abv_auth = &auth_abbrev();
@@ -107,6 +109,7 @@ sub initialize_authen_forms {
     $authformint  = &Apache::loncommon::authform_internal(%param);
     $authformfsys = &Apache::loncommon::authform_filesystem(%param);
     $authformloc  = &Apache::loncommon::authform_local(%param);
+    $authformlti  = &Apache::loncommon::authform_lti(%param);
 }
 
 sub auth_abbrev {
@@ -116,6 +119,7 @@ sub auth_abbrev {
                      internal  => 'int',
                      localauth => 'loc',
                      unix      => 'fsys',
+                     lti       => 'lti',
                    );
     return %abv_auth;
 }
@@ -243,6 +247,7 @@ sub build_tools_display {
                    'aboutme'    => "Personal Information Page",
                    'webdav'     => "WebDAV access to Authoring Spaces (if SSL and author/co-author)",
                    'portfolio'  => "Personal User Portfolio",
+                   'timezone'   => "Can set Time Zone",
                    'avai'       => "Available",
                    'cusa'       => "availability",
                    'chse'       => "Change setting",
@@ -252,13 +257,17 @@ sub build_tools_display {
                    'unofficial' => 'Can request creation of unofficial courses',
                    'community'  => 'Can request creation of communities',
                    'textbook'   => 'Can request creation of textbook courses',
+                   'placement'  => 'Can request creation of placement tests',
+                   'lti'        => 'Can request creation of LTI courses',
                    'requestauthor'  => 'Can request author space',
     );
+    $isadv = &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
     if ($context eq 'requestcourses') {
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
                       'requestcourses.official','requestcourses.unofficial',
-                      'requestcourses.community','requestcourses.textbook');
-        @usertools = ('official','unofficial','community','textbook');
+                      'requestcourses.community','requestcourses.textbook',
+                      'requestcourses.placement','requestcourses.lti');
+        @usertools = ('official','unofficial','community','textbook','placement','lti');
         @options =('norequest','approval','autolimit','validate');
         %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
         %reqtitles = &courserequest_titles();
@@ -266,7 +275,6 @@ sub build_tools_display {
         $colspan = ' colspan="2"';
         %domconfig =
             &Apache::lonnet::get_dom('configuration',['requestcourses'],$ccdomain);
-        $isadv = &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
     } elsif ($context eq 'requestauthor') {
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
                                                     'requestauthor');
@@ -280,17 +288,18 @@ sub build_tools_display {
     } else {
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
                           'tools.aboutme','tools.portfolio','tools.blog',
-                          'tools.webdav');
-        @usertools = ('aboutme','blog','webdav','portfolio');
+                          'tools.webdav','tools.timezone');
+        @usertools = ('aboutme','blog','webdav','portfolio','timezone');
     }
     foreach my $item (@usertools) {
         my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off,
             $currdisp,$custdisp,$custradio);
         $cust_off = 'checked="checked" ';
         $tool_on = 'checked="checked" ';
-        $curr_access =  
+        $curr_access =
             &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
-                                              $context);
+                                              $context,\%userenv,'',
+                                              {'is_adv' => $isadv});
         if ($context eq 'requestauthor') {
             if ($userenv{$context} ne '') {
                 $cust_on = ' checked="checked" ';
@@ -333,6 +342,7 @@ sub build_tools_display {
                    '   <td'.$colspan.'>'.$lt{$item}.'</td>'."\n".
                    '  </tr>'."\n".
                    &Apache::loncommon::start_data_table_row()."\n";
+  
         if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
             my ($curroption,$currlimit);
             my $envkey = $context.'.'.$item;
@@ -451,12 +461,14 @@ sub coursereq_externaluser {
                    'unofficial' => 'Can request creation of unofficial courses',
                    'community'  => 'Can request creation of communities',
                    'textbook'   => 'Can request creation of textbook courses',
+                   'placement'  => 'Can request creation of placement tests',
     );
 
     %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
                       'reqcrsotherdom.official','reqcrsotherdom.unofficial',
-                      'reqcrsotherdom.community','reqcrsotherdom.textbook');
-    @usertools = ('official','unofficial','community','textbook');
+                      'reqcrsotherdom.community','reqcrsotherdom.textbook',
+                      'reqcrsotherdom.placement');
+    @usertools = ('official','unofficial','community','textbook','placement');
     @options = ('approval','validate','autolimit');
     %validations = &Apache::lonnet::auto_courserequest_checks($cdom);
     my $optregex = join('|',@options);
@@ -537,6 +549,8 @@ sub courserequest_titles {
                                    unofficial => 'Unofficial',
                                    community  => 'Communities',
                                    textbook   => 'Textbook',
+                                   placement  => 'Placement Tests',
+                                   lti        => 'LTI Provider',
                                    norequest  => 'Not allowed',
                                    approval   => 'Approval by Dom. Coord.',
                                    validate   => 'With validation',
@@ -880,7 +894,15 @@ ENDBLOCK
         (!(($env{'form.action'} eq 'singleuser') && ($context eq 'domain') &&
         (!&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))))) {
         my $defdom=$env{'request.role.domain'};
-        my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
+        my ($trusted,$untrusted);
+        if ($context eq 'course') {
+            ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$defdom);
+        } elsif ($context eq 'author') {
+            ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('othcoau',$defdom);
+        } elsif ($context eq 'domain') {
+            ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('domroles',$defdom); 
+        }
+        my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain',undef,undef,undef,$trusted,$untrusted);
         my %lt=&Apache::lonlocal::texthash(
                   'enro' => 'Enroll one student',
                   'enrm' => 'Enroll one member',
@@ -1465,15 +1487,21 @@ ENDAUTH
                                          $inst_results{$ccuname.':'.$ccdomain}));
         if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) ||
             (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) {
-            $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
-                      &Apache::loncommon::start_data_table());
-            if ($env{'request.role.domain'} eq $ccdomain) {
-                $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
+            $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'."\n");
+            if (($env{'request.role.domain'} eq $ccdomain) ||
+                (&Apache::lonnet::will_trust('reqcrs',$ccdomain,$env{'request.role.domain'}))) {
+                $r->print(&Apache::loncommon::start_data_table());
+                if ($env{'request.role.domain'} eq $ccdomain) {
+                    $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
+                } else {
+                    $r->print(&coursereq_externaluser($ccuname,$ccdomain,
+                                                      $env{'request.role.domain'}));
+                }
+                $r->print(&Apache::loncommon::end_data_table());
             } else {
-                $r->print(&coursereq_externaluser($ccuname,$ccdomain,
-                                                  $env{'request.role.domain'}));
+                $r->print(&mt('Domain configuration for this domain prohibits course creation by users from domain: "[_1]"',
+                              &Apache::lonnet::domain($ccdomain,'description')));
             }
-            $r->print(&Apache::loncommon::end_data_table());
         }
         $r->print('</div>');
         my @order = ('auth','quota','tools','requestauthor');
@@ -1486,7 +1514,7 @@ ENDAUTH
              ($env{'request.role.domain'} eq $ccdomain)) {
             $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);
         }
-        $user_text{'auth'} =  &user_authentication($ccuname,$ccdomain,$formname);
+        $user_text{'auth'} =  &user_authentication($ccuname,$ccdomain,$formname,$crstype,$permission);
         if ((&Apache::lonnet::allowed('mpq',$ccdomain)) ||
             (&Apache::lonnet::allowed('mut',$ccdomain)) ||
             (&Apache::lonnet::allowed('udp',$ccdomain))) {
@@ -1591,7 +1619,7 @@ ENDNOTOOLSPRIV
                 if ($newuser) {
                     $r->print(' onclick="auth_check()" \>'."\n");
                 } else {
-                    $r->print('onclick="this.form.submit()" \>'."\n");
+                    $r->print(' onclick="this.form.submit()" \>'."\n");
                 }
             } else {
                 $r->print('</fieldset></div>'.
@@ -2129,11 +2157,20 @@ sub new_domain_roles {
     '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.
     &Apache::loncommon::end_data_table_header_row();
     my @allroles = &Apache::lonuserutils::roles_by_context('domain');
+    my $uprimary = &Apache::lonnet::domain($env{'request.role.domain'},'primary');
+    my $uintdom = &Apache::lonnet::internet_dom($uprimary);
     foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) {
         foreach my $role (@allroles) {
             next if ($role eq 'ad');
             next if (($role eq 'au') && ($ccdomain ne $thisdomain));
             if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {
+               if ($role eq 'dc') {
+                   unless ($thisdomain eq $env{'request.role.domain'}) {
+                       my $domprim = &Apache::lonnet::domain($thisdomain,'primary');
+                       my $intdom = &Apache::lonnet::internet_dom($domprim);
+                       next unless ($uintdom eq $intdom);
+                   }
+               }
                my $plrole=&Apache::lonnet::plaintext($role);
                my %lt=&Apache::lonlocal::texthash(
                     'ssd'  => "Set Start Date",
@@ -2164,7 +2201,7 @@ sub new_domain_roles {
 }
 
 sub user_authentication {
-    my ($ccuname,$ccdomain,$formname) = @_;
+    my ($ccuname,$ccdomain,$formname,$crstype,$permission) = @_;
     my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
     my $outcome;
     my %lt=&Apache::lonlocal::texthash(
@@ -2175,7 +2212,7 @@ sub user_authentication {
                    'ld'    => "Login Data"
     );
     # Check for a bad authentication type
-    if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) {
+    if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth|lti):/) {
         # bad authentication scheme
         if (&Apache::lonnet::allowed('mau',$ccdomain)) {
             &initialize_authen_forms($ccdomain,$formname);
@@ -2202,6 +2239,7 @@ $lt{'uuas'} ($currentauth). $lt{'adcs'}.
 ENDBADAUTH
         }
     } else { # Authentication type is valid
+        
         &initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser');
         my ($authformcurrent,$can_modify,@authform_others) =
             &modify_login_block($ccdomain,$currentauth);
@@ -2236,6 +2274,43 @@ ENDBADAUTH
             }
             $outcome .= &Apache::loncommon::end_data_table();
         } else {
+            if (($currentauth =~ /^internal:/) &&
+                (&Apache::lonuserutils::can_change_internalpass($ccuname,$ccdomain,$crstype,$permission))) {
+                $outcome = <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+function togglePwd(form) {
+    if (form.newintpwd.length) {
+        if (document.getElementById('LC_ownersetpwd')) {
+            for (var i=0; i<form.newintpwd.length; i++) {
+                if (form.newintpwd[i].checked) {
+                    if (form.newintpwd[i].value == 1) {
+                        document.getElementById('LC_ownersetpwd').style.display = 'inline-block';
+                    } else {
+                        document.getElementById('LC_ownersetpwd').style.display = 'none';
+                    }
+                }
+            }
+        }
+    }
+}
+// ]]>
+</script>
+ENDJS
+
+                $outcome .= '<h3>'.$lt{'ld'}.'</h3>'.
+                            &Apache::loncommon::start_data_table().
+                            &Apache::loncommon::start_data_table_row().
+                            '<td>'.&mt('Internally authenticated').'<br />'.&mt("Change user's password?").
+                            '<label><input type="radio" name="newintpwd" value="0" checked="checked" onclick="togglePwd(this.form);" />'.
+                            &mt('No').'</label>'.('&nbsp;'x2).
+                            '<label><input type="radio" name="newintpwd" value="1" onclick="togglePwd(this.form);" />'.&mt('Yes').'</label>'.
+                            '<div id="LC_ownersetpwd" style="display:none">'.
+                            '&nbsp;&nbsp;'.&mt('Password').' <input type="password" size="15" name="intarg" value="" />'.
+                            '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.intarg.type='."'text'".' } else { this.form.intarg.type='."'password'".' }" />'.&mt('Visible input').'</label></div></td>'.
+                            &Apache::loncommon::end_data_table_row().
+                            &Apache::loncommon::end_data_table();
+            }
             if (&Apache::lonnet::allowed('udp',$ccdomain)) {
                 # Current user has rights to view domain preferences for user's domain
                 my $result;
@@ -2253,6 +2328,8 @@ ENDBADAUTH
                     $result = &mt('Currently using local (institutional) authentication.');
                 } elsif ($currentauth =~ /^unix:/) {
                     $result = &mt('Currently Filesystem Authenticated.');
+                } elsif ($currentauth =~ /^lti:/) {
+                    $result = &mt('Currently LTI authenticated.');
                 }
                 $outcome = '<h3>'.$lt{'ld'}.'</h3>'.
                            &Apache::loncommon::start_data_table().
@@ -2291,6 +2368,9 @@ sub modify_login_block {
         if ($can_assign{'loc'}) {
             push(@authform_others,$authformloc);
         }
+        if ($can_assign{'lti'}) {
+            push(@authform_others,$authformlti);
+        }
         if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
             $show_override_msg = 1;
         }
@@ -2302,6 +2382,9 @@ sub modify_login_block {
         if ($can_assign{'loc'}) {
             push(@authform_others,$authformloc);
         }
+        if ($can_assign{'lti'}) {
+            push(@authform_others,$authformlti);
+        }
         if ($can_assign{'int'}) {
             $show_override_msg = 1;
         }
@@ -2316,6 +2399,9 @@ sub modify_login_block {
         if ($can_assign{'loc'}) {
             push(@authform_others,$authformloc);
         }
+        if ($can_assign{'lti'}) {
+            push(@authform_others,$authformlti);
+        }
         if ($can_assign{'fsys'}) {
             $show_override_msg = 1;
         }
@@ -2327,9 +2413,23 @@ sub modify_login_block {
         if ($can_assign{'int'}) {
             push(@authform_others,$authformint);
         }
+        if ($can_assign{'lti'}) {
+            push(@authform_others,$authformlti);
+        }
         if ($can_assign{'loc'}) {
             $show_override_msg = 1;
         }
+    } elsif ($currentauth=~/^lti:/) {
+        $authformcurrent=$authformlti;
+        if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+            push(@authform_others,$authformkrb);
+        }
+        if ($can_assign{'int'}) {
+            push(@authform_others,$authformint);
+        }
+        if ($can_assign{'loc'}) {
+            push(@authform_others,$authformloc);
+        }
     }
     if ($show_override_msg) {
         $authformcurrent = '<table><tr><td colspan="3">'.$authformcurrent.
@@ -2344,8 +2444,8 @@ sub modify_login_block {
 }
 
 sub personal_data_display {
-    my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,
-        $now,$captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded) = @_;
+    my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,$now,
+        $captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded,$showsubmit) = @_;
     my ($output,%userenv,%canmodify,%canmodify_status);
     my @userinfo = ('firstname','middlename','lastname','generation',
                     'permanentemail','id');
@@ -2428,7 +2528,7 @@ sub personal_data_display {
             } else {
                 undef($condition);
             }
-        }
+        } 
         if ($excluded) {
             unless ($excluded =~ /^\@[^\@]+$/) {
                 undef($condition);
@@ -2455,8 +2555,8 @@ sub personal_data_display {
         }
         $rowcount ++;
         $output .= &Apache::lonhtmlcommon::row_closure(1);
-        my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="off" />';
-        my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="20" autocomplete="off" />';
+        my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="new-password" />';
+        my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="20" autocomplete="new-password" />';
         $output .= &Apache::lonhtmlcommon::row_title(&mt('Password').'<b>*</b>',
                                                     'LC_pick_box_title',
                                                     'LC_oddrow_value')."\n".
@@ -2468,12 +2568,13 @@ sub personal_data_display {
                    $upasstwo.
                    &Apache::lonhtmlcommon::row_closure()."\n";
         if ($usernameset eq 'free') {
-            my $onclick = "toggleUsernameDisp(this,'selfcreateusername');";
+            my $onclick = "toggleUsernameDisp(this,'selfcreateusername');"; 
             $output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n".
-                       &mt('Use e-mail address: ').
-                       '<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.&mt('Yes').'</label>'."\n".
-                       ('&nbsp;'x2).
-                       '<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.&mt('No').'</label>'."\n".
+                       '<span class="LC_nobreak">'.&mt('Use e-mail address: ').
+                       '<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.
+                       &mt('Yes').'</label>'.('&nbsp;'x2).
+                       '<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.
+                       &mt('No').'</label></span>'."\n".
                        '<div id="selfcreateusername" style="display: none; font-size: smaller">'.
                        '<br /><span class="LC_nobreak">'.&mt('Preferred username').
                        '&nbsp;<input type="text" name="username" value="" size="20" autocomplete="off"/>'.
@@ -2581,12 +2682,17 @@ sub personal_data_display {
                        &Apache::lonhtmlcommon::row_closure(1); 
             $rowcount ++;
         }
-        my $submit_text = &mt('Create account');
-        $output .= &Apache::lonhtmlcommon::row_title()."\n".
-                   '<br /><input type="submit" name="createaccount" value="'.
-                   $submit_text.'" />'.
-                   '<input type="hidden" name="type" value="'.$usertype.'" />'.
-                   &Apache::lonhtmlcommon::row_closure(1);
+        if ($showsubmit) {
+            my $submit_text = &mt('Create account');
+            $output .= &Apache::lonhtmlcommon::row_title()."\n".
+                       '<br /><input type="submit" name="createaccount" value="'.
+                       $submit_text.'" />';
+            if ($usertype ne '') {
+                $output .= '<input type="hidden" name="type" value="'.
+                           &HTML::Entities::encode($usertype,'\'<>"&').'" />';
+            }
+            $output .= &Apache::lonhtmlcommon::row_closure(1);
+        }
     }
     $output .= &Apache::lonhtmlcommon::end_pick_box();
     if (wantarray) {
@@ -2670,7 +2776,7 @@ sub get_inststatuses {
 
 # ================================================================= Phase Three
 sub update_user_data {
-    my ($r,$context,$crstype,$brcrum,$showcredits) = @_; 
+    my ($r,$context,$crstype,$brcrum,$showcredits,$permission) = @_; 
     my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
                                           $env{'form.ccdomain'});
     # Error messages
@@ -2788,6 +2894,9 @@ sub update_user_data {
 	$amode='localauth';
 	$genpwd=$env{'form.locarg'};
 	$genpwd=" " if (!$genpwd);
+    } elsif ($env{'form.login'} eq 'lti') {
+        $amode='lti';
+        $genpwd=" ";
     } elsif (($env{'form.login'} eq 'nochange') ||
              ($env{'form.login'} eq ''        )) { 
         # There is no need to tell the user we did not change what they
@@ -2806,8 +2915,8 @@ sub update_user_data {
 
     my (%alerts,%rulematch,%inst_results,%curr_rules);
     my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
-    my @usertools = ('aboutme','blog','webdav','portfolio');
-    my @requestcourses = ('official','unofficial','community','textbook');
+    my @usertools = ('aboutme','blog','webdav','portfolio','timezone');
+    my @requestcourses = ('official','unofficial','community','textbook','placement','lti');
     my @requestauthor = ('requestauthor');
     my ($othertitle,$usertypes,$types) = 
         &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
@@ -2936,7 +3045,7 @@ sub update_user_data {
                                           $env{'form.ccdomain'},$env{'form.ccuname'});
             } 
         }
-        $r->print('<br />'.&mt('Home server').': '.$uhome.' '.
+        $r->print('<br />'.&mt('Home Server').': '.$uhome.' '.
                   &Apache::lonnet::hostname($uhome));
     } elsif (($env{'form.login'} ne 'nochange') &&
              ($env{'form.login'} ne ''        )) {
@@ -2951,12 +3060,19 @@ sub update_user_data {
                       &Apache::lonnet::modifyuserauth(
 		       $env{'form.ccdomain'},$env{'form.ccuname'},
                        $amode,$genpwd));
-            $r->print('<br />'.&mt('Home server').': '.&Apache::lonnet::homeserver
+            $r->print('<br />'.&mt('Home Server').': '.&Apache::lonnet::homeserver
 		  ($env{'form.ccuname'},$env{'form.ccdomain'}));
 	} else {
 	    # Okay, this is a non-fatal error.
-	    $r->print($error.&mt('You do not have the authority to modify this users authentication information.').$end);    
+	    $r->print($error.&mt('You do not have privileges to modify the authentication configuration for this user.').$end);
 	}
+    } elsif (($env{'form.intarg'} ne '') &&
+             (&Apache::lonnet::queryauthenticate($env{'form.ccuname'},$env{'form.ccdomain'}) =~ /^internal:/) &&
+             (&Apache::lonuserutils::can_change_internalpass($env{'form.ccuname'},$env{'form.ccdomain'},$crstype,$permission))) {
+        $r->print('Modifying authentication: '.
+                  &Apache::lonnet::modifyuserauth(
+                  $env{'form.ccdomain'},$env{'form.ccuname'},
+                  'internal',$env{'form.intarg'}));
     }
     $r->rflush(); # Finish display of header before time consuming actions start
     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state);
@@ -2975,12 +3091,14 @@ sub update_user_data {
         my %userenv = &Apache::lonnet::get
             ('environment',['firstname','middlename','lastname','generation',
              'id','permanentemail','portfolioquota','authorquota','inststatus',
-             'tools.aboutme','tools.blog','tools.webdav','tools.portfolio',
+             'tools.aboutme','tools.blog','tools.webdav',
+             'tools.portfolio','tools.timezone',
              'requestcourses.official','requestcourses.unofficial',
              'requestcourses.community','requestcourses.textbook',
+             'requestcourses.lti','requestauthor',
              'reqcrsotherdom.official','reqcrsotherdom.unofficial',
              'reqcrsotherdom.community','reqcrsotherdom.textbook',
-             'requestauthor'],
+             'reqcrsotherdom.placement'],
               $env{'form.ccdomain'},$env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
@@ -3010,7 +3128,7 @@ sub update_user_data {
                 }
             } elsif ($context eq 'author') {
                 if ($rolenum eq $auname && $roledom eq $audom) {
-                    if (!grep(/^\Q$role\E$/,@userroles)) { 
+                    if (!grep(/^\Q$role\E$/,@userroles)) {
                         push(@userroles,$role);
                     }
                 }
@@ -3271,8 +3389,9 @@ sub update_user_data {
                         ($env{'user.domain'} eq $env{'form.ccdomain'})) {
                         my %newenvhash;
                         foreach my $key (keys(%changed)) {
-                            if (($key eq 'official') || ($key eq 'unofficial')
-                                || ($key eq 'community') || ($key eq 'textbook')) {
+                            if (($key eq 'official') || ($key eq 'unofficial') ||
+                                ($key eq 'community') || ($key eq 'textbook') ||
+                                ($key eq 'placement') || ($key eq 'lti')) {
                                 $newenvhash{'environment.requestcourses.'.$key} =
                                     $changeHash{'requestcourses.'.$key};
                                 if ($changeHash{'requestcourses.'.$key}) {
@@ -3308,6 +3427,10 @@ sub update_user_data {
                             &Apache::lonnet::appenv(\%newenvhash);
                         }
                     }
+                    if ($changed{'aboutme'}) {
+                        &Apache::loncommon::devalidate_aboutme_cache($env{'form.ccuname'},
+                                                                     $env{'form.ccdomain'});
+                    }
                 }
             }
             if (keys(%namechanged) > 0) {
@@ -3338,7 +3461,7 @@ sub update_user_data {
                                   \%newsettingstext);
                 if ($env{'form.cid'} ne $userenv{'id'}) {
                     &Apache::lonnet::idput($env{'form.ccdomain'},
-                         {$env{'form.ccuname'} => $env{'form.cid'}});
+                         {$env{'form.ccuname'} => $env{'form.cid'}},$uhome,'ids');
                     if (($recurseid) &&
                         (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
                         my $idresult = 
@@ -3477,10 +3600,13 @@ sub display_userinfo {
          'webdav'         => 'WebDAV Availability',
          'aboutme'        => 'Personal Information Page Availability',
          'portfolio'      => 'Portfolio Availability',
+         'timezone'       => 'Can set own Time Zone',
          'official'       => 'Can Request Official Courses',
          'unofficial'     => 'Can Request Unofficial Courses',
          'community'      => 'Can Request Communities',
          'textbook'       => 'Can Request Textbook Courses',
+         'placement'      => 'Can Request Placement Tests',
+         'lti'            => 'Can Request LTI Courses',
          'requestauthor'  => 'Can Request Author Role',
          'inststatus'     => "Affiliation",
          'prvs'           => 'Previous Value:',
@@ -3851,7 +3977,13 @@ sub update_roles {
     my ($r,$context,$showcredits) = @_;
     my $now=time;
     my @rolechanges;
-    my %disallowed;
+    my (%disallowed,%got_role_approvals,%got_instdoms,%process_by,%instdoms,
+        %pending,%reject,%notifydc,%status,%unauthorized,%currqueued);
+    $got_role_approvals{$context} = '';
+    $process_by{$context} = {};
+    my @domroles = &Apache::lonuserutils::domain_roles();
+    my @cstrroles = &Apache::lonuserutils::construction_space_roles();
+    my @courseroles = &Apache::lonuserutils::roles_by_context('course',1);
     $r->print('<h3>'.&mt('Modifying Roles').'</h3>');
     foreach my $key (keys(%env)) {
 	next if (! $env{$key});
@@ -3953,6 +4085,7 @@ sub update_roles {
 	    if ($key=~/^form\.ren\:([^\_]+)\_([^\_\.]+)$/) {
                 my $url = $1;
                 my $role = $2;
+                my $id = $url.'_'.$role;
                 my $logmsg;
                 my $output;
                 if ($role eq 'st') {
@@ -3960,10 +4093,17 @@ sub update_roles {
                         my ($cdom,$cnum,$csec) = ($1,$2,$3);
                         my $credits;
                         if ($showcredits) {
-                            my $defaultcredits = 
+                            my $defaultcredits =
                                 &Apache::lonuserutils::get_defaultcredits($cdom,$cnum);
                             $credits = &get_user_credits($defaultcredits,$cdom,$cnum);
                         }
+                        unless ($udom eq $cdom) {
+                            next if (&Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                         $uname,$role,$now,0,$cdom,$cnum,$csec,$credits,
+                                         \%process_by,\%instdoms,\%got_role_approvals,
+                                         \%got_instdoms,\%reject,\%pending,\%notifydc,
+                                         \%status,\%unauthorized,\%currqueued));
+                        }
                         my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$cdom,$cnum,$csec,$context,$credits);
                         if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course') || ($result eq 'refused')) {
                             if ($result eq 'refused' && $logmsg) {
@@ -3979,12 +4119,28 @@ sub update_roles {
                         }
                     }
                 } else {
+                    my ($cdom,$cnum,$csec);
+                    if (grep(/^\Q$role\E$/,@cstrroles)) {
+                        ($cdom,$cnum) = ($url =~ m{^/($match_domain)/($match_username)$});
+                    } elsif (grep(/^\Q$role\E$/,@domroles)) {
+                        ($cdom) = ($url =~ m{^/($match_domain)/$});
+                    } elsif ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) {
+                        ($cdom,$cnum,$csec) = ($1,$2,$3);
+                    }
+                    if ($cdom ne '') {
+                        unless ($udom eq $cdom) {
+                            next if (&Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                         $uname,$role,$now,0,$cdom,$cnum,$csec,'',\%process_by,
+                                         \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                         \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued));
+                        }
+                    }
 		    my $result=&Apache::lonnet::assignrole($env{'form.ccdomain'},
                                $env{'form.ccuname'},$url,$role,0,$now,'','',
                                $context);
-                        $output = &Apache::lonhtmlcommon::confirm_success(&mt('Re-enabling [_1] in [_2]',
-                                        &Apache::lonnet::plaintext($role),
-                                        &Apache::loncommon::show_role_extent($url,$context,$role)),$result ne "ok").'<br />';
+                    $output = &Apache::lonhtmlcommon::confirm_success(&mt('Re-enabling [_1] in [_2]',
+                                    &Apache::lonnet::plaintext($role),
+                                    &Apache::loncommon::show_role_extent($url,$context,$role)),$result ne "ok").'<br />';
                     if ($result ne "ok") {
                         $output .= &mt('Error: [_1]',$result).'<br />';
                     }
@@ -3997,6 +4153,17 @@ sub update_roles {
 # Re-enable custom role
 	    if ($key=~m{^form\.ren\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
                 my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
+                my $id = $url.'_cr'."/$rdom/$rnam/$rolename";
+                my $role = "cr/$rdom/$rnam/$rolename";
+                if ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) {
+                    my ($cdom,$cnum,$csec) = ($1,$2,$3);
+                    unless ($udom eq $cdom) {
+                        next if (&Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                     $uname,$role,$now,0,$cdom,$cnum,$csec,'',\%process_by,
+                                     \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                     \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued));
+                    }
+                }
                 my $result = &Apache::lonnet::assigncustomrole(
                                $env{'form.ccdomain'}, $env{'form.ccuname'},
                                $url,$rdom,$rnam,$rolename,0,$now,undef,$context);
@@ -4018,6 +4185,8 @@ sub update_roles {
                 # Activate a custom role
 		my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5);
 		my $url='/'.$one.'/'.$two;
+                my $id = $url.'_cr/'."$three/$four/$five";
+                my $role = "cr/$three/$four/$five";
 		my $full=$one.'_'.$two.'_cr_cr_'.$three.'_'.$four.'_'.$five;
 
                 my $start = ( $env{'form.start_'.$full} ?
@@ -4026,15 +4195,22 @@ sub update_roles {
                 my $end   = ( $env{'form.end_'.$full} ?
                               $env{'form.end_'.$full} :
                               0 );
-                                                                                     
+
                 # split multiple sections
                 my %sections = ();
-                my $num_sections = &build_roles($env{'form.sec_'.$full},\%sections,$5);
+                my $num_sections = &build_roles($env{'form.sec_'.$full},\%sections,$five);
                 if ($num_sections == 0) {
+                    unless ($udom eq $one) {
+                        next if (&Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                     $uname,$role,$start,$end,$one,$two,'','',\%process_by,
+                                     \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                     \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued));
+                    }
                     $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end,$context));
                 } else {
 		    my %curr_groups =
 			&Apache::longroup::coursegroups($one,$two);
+                    my ($restricted,$numchanges);
                     foreach my $sec (sort {$a cmp $b} keys(%sections)) {
                         if (($sec eq 'none') || ($sec eq 'all') || 
                             exists($curr_groups{$sec})) {
@@ -4042,8 +4218,18 @@ sub update_roles {
                             next;
                         }
                         my $securl = $url.'/'.$sec;
+                        my $secid = $securl.'_cr'."/$three/$four/$five";
+                        undef($restricted);
+                        unless ($udom eq $one) {
+                            next if (&Apache::lonuserutils::restricted_dom($context,$secid,$udom,
+                                         $uname,$role,$start,$end,$one,$two,$sec,'',\%process_by,
+                                         \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                         \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued));
+                        }
+                        $numchanges ++;
 		        $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end,$context));
                     }
+                    next unless ($numchanges);
                 }
                 if (!grep(/^cr$/,@rolechanges)) {
                     push(@rolechanges,'cr');
@@ -4052,20 +4238,21 @@ sub update_roles {
 		# Activate roles for sections with 3 id numbers
 		# set start, end times, and the url for the class
 		my ($one,$two,$three)=($1,$2,$3);
-		my $start = ( $env{'form.start_'.$one.'_'.$two.'_'.$three} ? 
-			      $env{'form.start_'.$one.'_'.$two.'_'.$three} : 
+		my $start = ( $env{'form.start_'.$one.'_'.$two.'_'.$three} ?
+			      $env{'form.start_'.$one.'_'.$two.'_'.$three} :
 			      $now );
-		my $end   = ( $env{'form.end_'.$one.'_'.$two.'_'.$three} ? 
+		my $end   = ( $env{'form.end_'.$one.'_'.$two.'_'.$three} ?
 			      $env{'form.end_'.$one.'_'.$two.'_'.$three} :
 			      0 );
 		my $url='/'.$one.'/'.$two;
+                my $id = $url.'_'.$three;
                 my $type = 'three';
                 # split multiple sections
                 my %sections = ();
                 my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two.'_'.$three},\%sections,$three);
-                my $credits;
+                my ($credits,$numchanges);
                 if ($three eq 'st') {
-                    if ($showcredits) { 
+                    if ($showcredits) {
                         my $defaultcredits = 
                             &Apache::lonuserutils::get_defaultcredits($one,$two);
                         $credits = $env{'form.credits_'.$one.'_'.$two.'_'.$three};
@@ -4076,11 +4263,19 @@ sub update_roles {
                     }
                 }
                 if ($num_sections == 0) {
+                    unless ($udom eq $one) {
+                        next if (&Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                     $uname,$three,$start,$end,$one,$two,'',$credits,\%process_by,
+                                     \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                     \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued));
+                    }
+                    $numchanges ++;
                     $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'',$context,$credits));
                 } else {
                     my %curr_groups = 
 			&Apache::longroup::coursegroups($one,$two);
                     my $emptysec = 0;
+                    my $restricted;
                     foreach my $sec (sort {$a cmp $b} keys(%sections)) {
                         $sec =~ s/\W//g;
                         if ($sec ne '') {
@@ -4090,14 +4285,34 @@ sub update_roles {
                                 next;
                             }
                             my $securl = $url.'/'.$sec;
+                            my $secid = $securl.'_'.$three;
+                            unless ($udom eq $one) {
+                                undef($restricted);
+                                $restricted = &Apache::lonuserutils::restricted_dom($context,$secid,$udom,
+                                                  $uname,$three,$start,$end,$one,$two,$sec,$credits,\%process_by,
+                                                  \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                                  \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued);
+                                next if ($restricted);
+                            }
+                            $numchanges ++;
                             $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec,$context,$credits));
                         } else {
                             $emptysec = 1;
                         }
                     }
                     if ($emptysec) {
+                        unless ($udom eq $one) {
+                            undef($restricted);
+                            $restricted = &Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                              $uname,$three,$start,$end,$one,$two,'',$credits,\%process_by,
+                                              \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                              \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued);
+                            next if ($restricted);
+                        }
+                        $numchanges ++;
                         $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'',$context,$credits));
                     }
+                    next unless ($numchanges);
                 }
                 if (!grep(/^\Q$three\E$/,@rolechanges)) {
                     push(@rolechanges,$three);
@@ -4105,33 +4320,63 @@ sub update_roles {
 	    } elsif ($key=~/^form\.act\_([^\_]+)\_([^\_]+)$/) {
 		# Activate roles for sections with two id numbers
 		# set start, end times, and the url for the class
-		my $start = ( $env{'form.start_'.$1.'_'.$2} ? 
-			      $env{'form.start_'.$1.'_'.$2} : 
+		my $start = ( $env{'form.start_'.$1.'_'.$2} ?
+			      $env{'form.start_'.$1.'_'.$2} :
 			      $now );
-		my $end   = ( $env{'form.end_'.$1.'_'.$2} ? 
+		my $end   = ( $env{'form.end_'.$1.'_'.$2} ?
 			      $env{'form.end_'.$1.'_'.$2} :
 			      0 );
                 my $one = $1;
                 my $two = $2;
 		my $url='/'.$one.'/';
+                my $id = $url.'_'.$two;
                 # split multiple sections
                 my %sections = ();
+                my ($restricted,$numchanges);
                 my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two},\%sections,$two);
                 if ($num_sections == 0) {
+                    unless ($udom eq $one) {
+                        $restricted = &Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                          $uname,$two,$start,$end,$one,$two,'','',\%process_by,
+                                          \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                          \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued);
+                        next if ($restricted);
+                    }
+                    $numchanges ++;
                     $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,'',$context));
                 } else {
                     my $emptysec = 0;
                     foreach my $sec (sort {$a cmp $b} keys(%sections)) {
                         if ($sec ne '') {
                             my $securl = $url.'/'.$sec;
+                            my $secid = $securl.'_'.$two;
+                            unless ($udom eq $one) {
+                                undef($restricted);
+                                $restricted = &Apache::lonuserutils::restricted_dom($context,$secid,$udom,
+                                                  $uname,$two,$start,$end,$one,$two,$sec,'',\%process_by,
+                                                  \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                                  \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued);
+                                next if ($restricted);
+                            }
+                            $numchanges ++;
                             $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$two,$start,$end,$one,undef,$sec,$context));
                         } else {
                             $emptysec = 1;
                         }
                     }
                     if ($emptysec) {
+                        unless ($udom eq $one) {
+                            undef($restricted);
+                            $restricted = &Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                              $uname,$two,$start,$end,$one,$two,'','',\%process_by,
+                                              \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                              \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued);
+                            next if ($restricted);
+                        }
+                        $numchanges ++;
                         $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,'',$context));
                     }
+                    next unless ($numchanges); 
                 }
                 if (!grep(/^\Q$two\E$/,@rolechanges)) {
                     push(@rolechanges,$two);
@@ -4155,6 +4400,12 @@ sub update_roles {
             }
 	}
     } # End of foreach (keys(%env))
+    if ((keys(%reject)) || (keys(%unauthorized))) {
+        $r->print(&Apache::lonuserutils::print_roles_rejected($context,\%reject,\%unauthorized));
+    }
+    if ((keys(%pending)) || (keys(%currqueued))) {
+        $r->print(&Apache::lonuserutils::print_roles_queued($context,\%pending,\%notifydc,\%currqueued));
+    }
 # Flush the course logs so reverse user roles immediately updated
     $r->register_cleanup(\&Apache::lonnet::flushcourselogs);
     if (@rolechanges == 0) {
@@ -4209,11 +4460,35 @@ sub enroll_single_student {
             }
         }
     }
+    my ($startdate,$enddate) = &Apache::lonuserutils::get_dates_from_form();
+    my (%got_role_approvals,%got_instdoms,%process_by,%instdoms,%pending,%reject,%notifydc,
+        %status,%unauthorized,%currqueued);
+    unless ($env{'form.ccdomain'} eq $env{'course.'.$env{'request.course.id'}.'.domain'}) {
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $csec = $env{'form.sections'};
+        my $id = "/$cdom/$cnum";
+        if ($csec ne '') {
+            $id .= "/$csec";
+        }
+        $id .= '_st';
+        if (&Apache::lonuserutils::restricted_dom($context,$id,$env{'form.ccdomain'},$env{'form.ccuname'},
+                                                  'st',$startdate,$enddate,$cdom,$cnum,$csec,$credits,
+                                                  \%process_by,\%instdoms,\%got_role_approvals,\%got_instdoms,
+                                                  \%reject,\%pending,\%notifydc,\%status,\%unauthorized,\%currqueued)) {
+            if ((keys(%reject)) || (keys(%unauthorized))) {
+                $r->print(&Apache::lonuserutils::print_roles_rejected($context,\%reject,\%unauthorized));
+            }
+            if ((keys(%pending)) || (keys(%currqueued))) {
+                $r->print(&Apache::lonuserutils::print_roles_queued($context,\%pending,\%notifydc,\%currqueued));
+            }
+            return;
+        }
+    }
 
     # Clean out any old student roles the user has in this class.
     &Apache::lonuserutils::modifystudent($env{'form.ccdomain'},
          $env{'form.ccuname'},$env{'request.course.id'},undef,$uhome);
-    my ($startdate,$enddate) = &Apache::lonuserutils::get_dates_from_form();
     my $enroll_result =
         &Apache::lonnet::modify_student_enrollment($env{'form.ccdomain'},
             $env{'form.ccuname'},$env{'form.cid'},$env{'form.cfirstname'},
@@ -4575,6 +4850,31 @@ sub set_custom_role {
     );
 }
 
+sub show_role_requests {
+    my ($caller,$dom) = @_;
+    my $showrolereqs;
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['privacy'],$dom);
+    if (ref($domconfig{'privacy'}) eq 'HASH') {
+        if (ref($domconfig{'privacy'}{'approval'}) eq 'HASH') {
+            my %approvalconf = %{$domconfig{'privacy'}{'approval'}};
+            foreach my $key ('instdom','extdom') {
+                if (ref($approvalconf{$key}) eq 'HASH') {
+                    if (keys(%{$approvalconf{$key}})) {
+                        foreach my $context ('domain','author','course','community') {
+                            if ($approvalconf{$key}{$context} eq $caller) {
+                                $showrolereqs = 1;
+                                last if ($showrolereqs);
+                            }
+                        }
+                    }
+                }
+                last if ($showrolereqs);
+            }
+        }
+    }
+    return $showrolereqs;
+}
+
 # ================================================================ Main Handler
 sub handler {
     my $r = shift;
@@ -4722,16 +5022,41 @@ sub handler {
         if (! exists($env{'form.state'})) {
             &Apache::lonuserutils::print_first_users_upload_form($r,$context);
         } elsif ($env{'form.state'} eq 'got_file') {
-            &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission,
-                                                             $crstype,$showcredits);
+            my $result = 
+                &Apache::lonuserutils::print_upload_manager_form($r,$context,
+                                                                 $permission,
+                                                                 $crstype,$showcredits);
+            if ($result eq 'missingdata') {
+                delete($env{'form.state'});
+                &Apache::lonuserutils::print_first_users_upload_form($r,$context);
+            }
         } elsif ($env{'form.state'} eq 'enrolling') {
             if ($env{'form.datatoken'}) {
-                &Apache::lonuserutils::upfile_drop_add($r,$context,$permission,
-                                                       $showcredits);
+                my $result = &Apache::lonuserutils::upfile_drop_add($r,$context,
+                                                                    $permission,
+                                                                    $showcredits);
+                if ($result eq 'missingdata') {
+                    delete($env{'form.state'});
+                    &Apache::lonuserutils::print_first_users_upload_form($r,$context);
+                } elsif ($result eq 'invalidhome') {
+                    $env{'form.state'} = 'got_file';
+                    delete($env{'form.lcserver'});
+                    my $result =
+                        &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission,
+                                                                         $crstype,$showcredits);
+                    if ($result eq 'missingdata') {
+                        delete($env{'form.state'});
+                        &Apache::lonuserutils::print_first_users_upload_form($r,$context);
+                    }
+                }
+            } else {
+                delete($env{'form.state'});
+                &Apache::lonuserutils::print_first_users_upload_form($r,$context);
             }
         } else {
             &Apache::lonuserutils::print_first_users_upload_form($r,$context);
         }
+        $r->print('</form>');
     } elsif (((($env{'form.action'} eq 'singleuser') || ($env{'form.action'}
               eq 'singlestudent')) && ($permission->{'cusr'})) ||
              (($env{'form.action'} eq 'singleuser') && ($permission->{'view'})) ||
@@ -4837,7 +5162,7 @@ sub handler {
                 &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
             }
         } elsif ($env{'form.phase'} eq 'update_user_data') {
-            &update_user_data($r,$context,$crstype,$brcrum,$showcredits);
+            &update_user_data($r,$context,$crstype,$brcrum,$showcredits,$permission);
         } else {
             &print_username_entry_form($r,$context,undef,$srch,undef,$crstype,
                                        $brcrum,$permission);
@@ -5011,7 +5336,7 @@ sub handler {
                                               &Apache::lonhtmlcommon::row_closure(1));
                                 }
                             }
-                            if ($pickstart) {
+                            if ($pickstart) { 
                                 $r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');
                             } else {
                                 $r->print('<div>'.&mt('No information to display for this account request.').'</div>');
@@ -5215,7 +5540,8 @@ sub handler {
                      '<span class="LC_error">'.&mt('You do not have permission to view change logs').'</span>');
         }
     } elsif ($env{'form.action'} eq 'helpdesk') {
-        if (($permission->{'owner'}) || ($permission->{'co-owner'})) {
+        if (($permission->{'owner'} || $permission->{'co-owner'}) &&
+            ($permission->{'cusr'} || $permission->{'view'})) {
             if ($env{'form.state'} eq 'process') {
                 if ($permission->{'owner'}) {
                     &update_helpdeskaccess($r,$permission,$brcrum);
@@ -5229,6 +5555,26 @@ sub handler {
             $r->print(&header(undef,{'no_nav_bar' => 1}).
                       '<span class="LC_error">'.&mt('You do not have permission to view helpdesk access').'</span>');
         }
+    } elsif ($env{'form.action'} eq 'rolerequests') {
+        if ($permission->{cusr} || $permission->{view}) {
+            &print_queued_roles($r,$context,$permission,$brcrum);
+        }
+    } elsif ($env{'form.action'} eq 'queuedroles') {
+        if (($permission->{cusr}) && ($context eq 'domain')) {
+            if (&show_role_requests($context,$env{'request.role.domain'})) {
+                if ($env{'form.state'} eq 'done') {
+                    &process_pendingroles($r,$context,$permission,$brcrum);
+                } else {
+                    &print_pendingroles($r,$context,$permission,$brcrum);
+                }
+            } else {
+                $r->print(&header(undef,{'no_nav_bar' => 1}).
+                          '<span class="LC_info">'.&mt('Domain coordinator approval of requests from other domains for assignment of roles to users from this domain not in use.').'</span>');
+            }
+        } else {
+            $r->print(&header(undef,{'no_nav_bar' => 1}).
+                     '<span class="LC_error">'.&mt('You do not have permission to view queued requests from other domains for assignment of roles to users from this domain.').'</span>');
+        }
     } else {
         $bread_crumbs_component = 'User Management';
         $args = { bread_crumbs           => $brcrum,
@@ -5480,6 +5826,7 @@ sub print_main_menu {
                             listusers  => 'Show and manage users in this community.',
                            },
                 );
+
   if ($linkcontext eq 'domain') {
       unless ($permission->{'cusr'}) {
           $links{'domain'}{'singleuser'} = 'View a User';
@@ -5601,6 +5948,7 @@ sub print_main_menu {
                                           groups => 'Community Groups',
                                         },
                        );
+        $linktext{'Placement'} = $linktext{'Course'};
 
         my %linktitle = (
             'Course' => {
@@ -5615,6 +5963,8 @@ sub print_main_menu {
                            },
         );
 
+        $linktitle{'Placement'} = $linktitle{'Course'};
+
         push(@{ $menu[0]->{items} }, #Category: Single Users
             {   
              linktext => $linktext{$crstype}{'single'},
@@ -5642,7 +5992,8 @@ sub print_main_menu {
              icon => 'helpdesk-access.png',
              #help => 'Course_Helpdesk_Access',
              url => '/adm/createuser?action=helpdesk',
-             permission => ($permission->{'owner'} || $permission->{'co-owner'}),
+             permission => (($permission->{'owner'} || $permission->{'co-owner'}) &&
+                            ($permission->{'view'} || $permission->{'cusr'})),
              linktitle => 'Helpdesk access options',
             },
             {
@@ -5721,6 +6072,28 @@ sub print_main_menu {
             },
         );
     }
+    push(@{ $menu[2]->{items} },
+        {
+         linktext => 'Role Requests (other domains)',
+         icon => 'edit-find.png',
+         #help => 'Role_Requests',
+         url => '/adm/createuser?action=rolerequests',
+         permission => $permission->{'cusr'},
+         linktitle => 'Role requests for users in other domains',
+        },
+    );
+    if (&show_role_requests($context,$env{'request.role.domain'})) {
+        push(@{ $menu[2]->{items} },
+            {
+             linktext => 'Queued Role Assignments (this domain)',
+             icon => 'edit-find.png',
+             #help => 'Role_Approvals',
+             url => '/adm/createuser?action=queuedroles',
+             permission => $permission->{'cusr'},
+             linktitle => "Role requests for this domain's users",
+            },
+        );
+    }
     return Apache::lonhtmlcommon::generate_menu(@menu);
 #               { text => 'View Log-in History',
 #                 help => 'Course_User_Logins',
@@ -6117,10 +6490,11 @@ ENDSCRIPT
                 } elsif ($curr_types eq '') {
                     $add_domtitle = &mt('Users in other domain:');
                 }
+                my ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$cdom);
                 $output .= &Apache::loncommon::start_data_table_row()
                            .'<td colspan="2"><span class="LC_nobreak">'.$add_domtitle.'</span><br />'
                            .&Apache::loncommon::select_dom_form('','selfenroll_newdom',
-                                                                $includeempty,$showdomdesc,'','','',$readonly)
+                                                                $includeempty,$showdomdesc,'',$trusted,$untrusted,$readonly)
                            .'<input type="hidden" name="selfenroll_types_total" value="'.$num.'" />'
                            .'</td>'.&Apache::loncommon::end_data_table_row()
                            .&Apache::loncommon::end_data_table();
@@ -7008,9 +7382,10 @@ ENDSCRIPT
     my ($nav_script,$nav_links);
 
 # table header
-    my $tableheader = '<h3>'.
+    my $heading = '<h3>'.
         &mt('User access logs for: [_1]',
-            &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).'</h3>'
+            &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).'</h3>';
+    my $tableheader = $heading
        .&Apache::loncommon::start_data_table_header_row()
        .'<th>&nbsp;</th>'
        .'<th>'.&mt('When').'</th>'
@@ -7128,7 +7503,7 @@ ENDSCRIPT
         $r->print(&Apache::loncommon::end_data_table().
                   &userlogdisplay_navlinks(\%curr,$more_records));
     } else { # No content displayed above
-        $r->print('<p class="LC_info">'
+        $r->print($heading.'<p class="LC_info">'
                  .&mt('There are no records to display.')
                  .'</p>');
     }
@@ -7178,7 +7553,7 @@ sub activity_display_filter {
     my $nolink = 1;
     my $output = '<table><tr><td valign="top">'.
                  '<span class="LC_nobreak"><b>'.&mt('Actions/page:').'</b></span><br />'.
-                 &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
+                 &Apache::lonmeta::selectbox('show',$curr->{'show'},'',undef,
                                               (&mt('all'),5,10,20,50,100,1000,10000)).
                  '</td><td>&nbsp;&nbsp;</td>';
     my $startform =
@@ -7265,14 +7640,10 @@ sub userlogdisplay_navlinks {
 
 sub role_display_filter {
     my ($context,$formname,$cdom,$cnum,$curr,$version,$crstype) = @_;
-    my $lctype;
-    if ($context eq 'course') {
-        $lctype = lc($crstype);
-    }
     my $nolink = 1;
     my $output = '<table><tr><td valign="top">'.
                  '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'.
-                 &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
+                 &Apache::lonmeta::selectbox('show',$curr->{'show'},'',undef,
                                               (&mt('all'),5,10,20,50,100,1000,10000)).
                  '</td><td>&nbsp;&nbsp;</td>';
     my $startform =
@@ -7296,7 +7667,7 @@ sub role_display_filter {
     if ($curr->{'role'} eq 'any') {
         $output .= ' selected="selected"';
     }
-    $output .=  '>'.&mt('Any').'</option>'."\n";
+    $output .= '>'.&mt('Any').'</option>'."\n";
     my @roles = &Apache::lonuserutils::roles_by_context($context,1,$crstype);
     foreach my $role (@roles) {
         my $plrole;
@@ -7317,12 +7688,12 @@ sub role_display_filter {
                &mt('Context:').'</b><br /><select name="chgcontext">';
     my @posscontexts;
     if ($context eq 'course') {
-        @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses');
+        @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses','chgtype');
     } elsif ($context eq 'domain') {
         @posscontexts = ('any','domain','requestauthor','domconfig','server');
     } else {
         @posscontexts = ('any','author','domain');
-    } 
+    }
     foreach my $chgtype (@posscontexts) {
         my $selstr = '';
         if ($curr->{'chgcontext'} eq $chgtype) {
@@ -7366,6 +7737,7 @@ sub rolechg_contexts {
         %lt = &Apache::lonlocal::texthash (
                                              any          => 'Any',
                                              automated    => 'Automated Enrollment',
+                                             chgtype      => 'Enrollment Type/Lock Change',
                                              updatenow    => 'Roster Update',
                                              createcourse => 'Course Creation',
                                              course       => 'User Management in course',
@@ -7802,6 +8174,67 @@ ENDJS
     return;
 }
 
+sub print_queued_roles {
+    my ($r,$context,$permission,$brcrum) = @_;
+    push (@{$brcrum},
+             {href => '/adm/createuser?action=rolerequests',
+              text => 'Role Requests (other domains)',
+              help => ''});
+    my $bread_crumbs_component = 'Role Requests';
+    my $args = { bread_crumbs           => $brcrum,
+                 bread_crumbs_component => $bread_crumbs_component};
+    # print page header
+    $r->print(&header('',$args));
+    my ($dom,$cnum);
+    $dom = $env{'request.role.domain'};
+    if ($context eq 'course') {
+        if ($env{'request.course.id'}) {
+            if (&Apache::loncommon::course_type() eq 'Community') {
+                $context = 'community';
+            }
+            $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        }
+    } elsif ($context eq 'author') {
+        $cnum = $env{'user.name'};
+    }
+    $r->print(&Apache::loncoursequeueadmin::display_queued_requests('othdomqueue',$dom,$cnum,$context));
+    return;
+}
+
+sub print_pendingroles {
+    my ($r,$context,$permission,$brcrum) = @_;
+    push (@{$brcrum},
+             {href => '/adm/createuser?action=queuedroles',
+              text => 'Queued Role Assignments (users in this domain)',
+              help => ''});
+    my $bread_crumbs_component = 'Queued Role Assignments';
+    my $args = { bread_crumbs           => $brcrum,
+                 bread_crumbs_component => $bread_crumbs_component};
+    # print page header
+    $r->print(&header('',$args));
+    $r->print(&Apache::loncoursequeueadmin::display_queued_requests('othdomaction',$env{'request.role.domain'},'','domain'));
+    return;
+}
+
+sub process_pendingroles {
+    my ($r,$context,$permission,$brcrum) = @_;
+    push (@{$brcrum},
+             {href => '/adm/createuser?action=queuedroles',
+              text => 'Queued Role Assignments (users in this domain)',
+              help => ''},
+             {href => '/adm/createuser?action=processrolereq',
+              text => 'Process Queue',
+              help => ''});
+    my $bread_crumbs_component = 'Queued Role Assignments';
+    my $args = { bread_crumbs           => $brcrum,
+                 bread_crumbs_component => $bread_crumbs_component};
+    # print page header
+    $r->print(&header('',$args));
+    $r->print(&Apache::loncoursequeueadmin::update_request_queue('othdombydc',
+                                                                 $env{'request.role.domain'}));
+    return;
+}
+
 sub domain_adhoc_access {
     my ($roles,$domcurrent,$accesstypes,$usertypes,$othertitle) = @_;
     my %domusage;
@@ -8430,7 +8863,7 @@ sub user_search_result {
             my $domd_chk = &domdirectorysrch_check($srch);
             $response .= '<span class="LC_warning">'.$instd_chk.'</span><br />';
             if ($domd_chk eq 'ok') {
-                $response .= &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.');
+                $response .= &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.');
             }
             $response .= '<br />';
         }
@@ -8441,7 +8874,7 @@ sub user_search_result {
                 my $instd_chk = &instdirectorysrch_check($srch);
                 $response .= '<span class="LC_warning">'.$domd_chk.'</span><br />';
                 if ($instd_chk eq 'ok') {
-                    $response .= &mt('You may want to search in the institutional directory instead of the LON-CAPA domain.');
+                    $response .= &mt('You may want to search in the institutional directory instead of in the LON-CAPA domain.');
                 }
                 $response .= '<br />';
             }
@@ -8542,7 +8975,7 @@ sub user_search_result {
                 $response = '<span class="LC_warning">'.
                     &mt('Institutional directory search is not available in domain: [_1]',$showdom).
                     '</span><br />'.
-                    &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
+                    &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.').
                     '<br />'; 
             }
         }
@@ -8615,7 +9048,7 @@ sub user_search_result {
                 $response = '<span class="LC_warning">'.
                     &mt('Institutional directory search is not available in domain: [_1]',$showdom).
                     '</span><br />'.
-                    &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
+                    &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.').
                     '<br />';
             }
         }