--- loncom/interface/loncreateuser.pm	2020/09/09 02:16:05	1.406.2.19
+++ loncom/interface/loncreateuser.pm	2022/11/16 14:47:57	1.406.2.20.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.406.2.19 2020/09/09 02:16:05 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.406.2.20.2.2 2022/11/16 14:47:57 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;
@@ -243,6 +244,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",
@@ -254,6 +256,7 @@ sub build_tools_display {
                    'textbook'   => 'Can request creation of textbook 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',
@@ -266,7 +269,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 +282,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" ';
@@ -1591,7 +1594,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>'.
@@ -2381,8 +2384,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');
@@ -2507,10 +2510,11 @@ sub personal_data_display {
         if ($usernameset eq 'free') {
             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"/>'.
@@ -2618,12 +2622,16 @@ 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="'.$usertype.'" />'.
+                           &Apache::lonhtmlcommon::row_closure(1);
+            }
+        }
     }
     $output .= &Apache::lonhtmlcommon::end_pick_box();
     if (wantarray) {
@@ -2843,7 +2851,7 @@ 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 @usertools = ('aboutme','blog','webdav','portfolio','timezone');
     my @requestcourses = ('official','unofficial','community','textbook');
     my @requestauthor = ('requestauthor');
     my ($othertitle,$usertypes,$types) = 
@@ -3019,7 +3027,8 @@ 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',
              'reqcrsotherdom.official','reqcrsotherdom.unofficial',
@@ -3352,6 +3361,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) {
@@ -3521,6 +3534,7 @@ 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',
@@ -7387,12 +7401,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) {
@@ -7436,6 +7450,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',