--- loncom/interface/lonuserutils.pm	2024/09/01 02:33:40	1.184.4.10.2.9
+++ loncom/interface/lonuserutils.pm	2024/07/04 16:29:50	1.184.4.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.184.4.10.2.9 2024/09/01 02:33:40 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.184.4.12 2024/07/04 16:29:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -114,11 +114,7 @@ sub modifyuserrole {
     } elsif ($context eq 'domain') {
         $scope = '/'.$env{'request.role.domain'}.'/';
     } elsif ($context eq 'author') {
-        if ($env{'request.role'} =~ m{^ca\.(/$match_domain/$match_username)$}) {
-            $scope = $1;
-        } else {
-            $scope =  '/'.$env{'user.domain'}.'/'.$env{'user.name'};
-        }
+        $scope =  '/'.$env{'user.domain'}.'/'.$env{'user.name'};
     }
     if ($context eq 'domain') {
         my $uhome = &Apache::lonnet::homeserver($uname,$udom);
@@ -555,7 +551,7 @@ END
 END
     } else {
         my ($numrules,$intargjs) =
-            &Apache::loncommon::passwd_validation_js('vf.elements[current.argfield].value',$domain);
+            &passwd_validation_js('vf.elements[current.argfield].value',$domain);
         $auth_checks .= (<<END);
     foundatype=1;
     if (current.argfield == null || current.argfield == '') {
@@ -675,6 +671,137 @@ END
     return $result;
 }
 
+sub passwd_validation_js {
+    my ($currpasswdval,$domain) = @_;
+    my %passwdconf = &Apache::lonnet::get_passwdconf($domain);
+    my ($min,$max,@chars,$numrules,$intargjs,%alert);
+    $numrules = 0;
+    $min = $Apache::lonnet::passwdmin;
+    if (ref($passwdconf{'chars'}) eq 'ARRAY') {
+        if ($passwdconf{'min'} =~ /^\d+$/) {
+            if ($passwdconf{'min'} > $min) {
+                $min = $passwdconf{'min'};
+            }
+        }
+        if ($passwdconf{'max'} =~ /^\d+$/) {
+            $max = $passwdconf{'max'};
+            $numrules ++;
+        }
+        @chars = @{$passwdconf{'chars'}};
+        if (@chars) {
+            $numrules ++;
+        }
+    }
+    if ($min > 0) {
+        $numrules ++;
+    }
+    if (($min > 0) || ($max ne '') || (@chars > 0)) {
+        my $alertmsg = &mt('Initial password did not satisfy requirement(s):').'\n\n';
+        if ($min) {
+            $alert{'min'} = &mt('minimum [quant,_1,character]',$min).'\n';
+        }
+        if ($max) {
+            $alert{'max'} = &mt('maximum [quant,_1,character]',$max).'\n';
+        }
+        my (@charalerts,@charrules);
+        if (@chars) {
+            if (grep(/^uc$/,@chars)) {
+                push(@charalerts,&mt('contain at least one upper case letter'));
+                push(@charrules,'uc');
+            }
+            if (grep(/^lc$/,@chars)) {
+                push(@charalerts,&mt('contain at least one lower case letter'));
+                push(@charrules,'lc');
+            }
+            if (grep(/^num$/,@chars)) {
+                push(@charalerts,&mt('contain at least one number'));
+                push(@charrules,'num');
+            }
+            if (grep(/^spec$/,@chars)) {
+                push(@charalerts,&mt('contain at least one non-alphanumeric'));
+                push(@charrules,'spec');
+            }
+        }
+        $intargjs = qq|            var rulesmsg = '';\n|.
+                    qq|            var currpwval = $currpasswdval;\n|;
+            if ($min) {
+                $intargjs .= qq|
+            if (currpwval.length < $min) {
+                rulesmsg += ' - $alert{min}';
+            }
+|;
+            }
+            if ($max) {
+                $intargjs .= qq|
+            if (currpwval.length > $max) {
+                rulesmsg += ' - $alert{max}';
+            }
+|;
+            }
+            if (@chars > 0) {
+                my $charrulestr = '"'.join('","',@charrules).'"';
+                my $charalertstr = '"'.join('","',@charalerts).'"';
+                $intargjs .= qq|            var brokerules = new Array();\n|.
+                             qq|            var charrules = new Array($charrulestr);\n|.
+                             qq|            var charalerts = new Array($charalertstr);\n|;
+                my %rules;
+                map { $rules{$_} = 1; } @chars;
+                if ($rules{'uc'}) {
+                    $intargjs .= qq|
+            var ucRegExp = /[A-Z]/;
+            if (!ucRegExp.test(currpwval)) {
+                brokerules.push('uc');
+            }
+|;
+                }
+                if ($rules{'lc'}) {
+                    $intargjs .= qq|
+            var lcRegExp = /[a-z]/;
+            if (!lcRegExp.test(currpwval)) {
+                brokerules.push('lc');
+            }
+|;
+                }
+                if ($rules{'num'}) {
+                     $intargjs .= qq|
+            var numRegExp = /[0-9]/;
+            if (!numRegExp.test(currpwval)) {
+                brokerules.push('num');
+            }
+|;
+                }
+                if ($rules{'spec'}) {
+                     $intargjs .= q|
+            var specRegExp = /[!"#$%&'()*+,\-.\/:;<=>?@[\\^\]_`{\|}~]/;
+            if (!specRegExp.test(currpwval)) {
+                brokerules.push('spec');
+            }
+|;
+                }
+                $intargjs .= qq|
+            if (brokerules.length > 0) {
+                for (var i=0; i<brokerules.length; i++) {
+                    for (var j=0; j<charrules.length; j++) {
+                        if (brokerules[i] == charrules[j]) {
+                            rulesmsg += ' - '+charalerts[j]+'\\n';
+                            break;
+                        }
+                    }
+                }
+            }
+|;
+            }
+            $intargjs .= qq|
+            if (rulesmsg != '') {
+                rulesmsg = '$alertmsg'+rulesmsg;
+                alert(rulesmsg);
+                return false;
+            }
+|;
+    }
+    return ($numrules,$intargjs);
+}
+
 ###############################################################
 ###############################################################
 sub upload_manager_javascript_forward_associate {
@@ -1508,14 +1635,6 @@ sub construction_space_roles {
         foreach my $role (@allroles) {
             if (&Apache::lonnet::allowed('c'.$role,$env{'user.domain'}.'/'.$env{'user.name'})) { 
                 push(@roles,$role); 
-            } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) {
-                my ($audom,$auname) = ($1,$2);
-                if (($role eq 'ca') || ($role eq 'aa')) {
-                    if ((&Apache::lonnet::allowed('v'.$role,,$audom.'/'.$auname)) &&
-                        ($env{"environment.internal.manager./$audom/$auname"})) {
-                        push(@roles,$role);
-                    }
-                }
             }
         }
         return @roles;
@@ -1619,24 +1738,6 @@ sub print_userlist {
     if (! exists($env{'form.sortby'})) {
         $env{'form.sortby'} = 'username';
     }
-    my ($showstart,$showend);
-    if (($env{'form.Status'} eq '') && ($env{'form.phase'} eq '') &&
-        ($env{'form.showrole'} eq '') && ($context eq 'course') &&
-        ($env{'request.course.id'} ne '') &&
-        ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'} ne '')) {
-        my $now = time;
-        my $startaccess = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_start_date'};
-        my $endaccess = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_end_date'};
-        if (($startaccess) && ($startaccess > $now)) {
-            $env{'form.Status'} = 'Future';
-            $showstart = 1;
-        }
-        if (($endaccess ne '') && ($endaccess != 0) && ($endaccess < $now)) {
-            $env{'form.Status'} = 'Expired';
-            undef($showstart);
-            $showend = 1;
-        }
-    }
     if ($env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) {
         $env{'form.Status'} = 'Active';
     }
@@ -1704,7 +1805,7 @@ sub print_userlist {
         $r->print(&section_group_filter($cnum,$cdom));
     }
     $r->print('</div><div class="LC_left_float">'.
-              &column_checkboxes($context,$mode,$formname,$showcredits,$showstart,$showend).
+              &column_checkboxes($context,$mode,$formname,$showcredits).
               '</div>');
     if ($env{'form.phase'} eq '') {
         $r->print('<br clear="all" />'.
@@ -1790,31 +1891,12 @@ sub print_userlist {
     } else {
         my (%cstr_roles,%dom_roles);
         if ($context eq 'author') {
-            my @possroles = &roles_by_context($context);
-            my @allowedroles;
             # List co-authors and assistant co-authors
-            my ($auname,$audom);
-            if ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) {
-                ($audom,$auname) = ($1,$2);
-                foreach my $role (@possroles) {
-                    if ((&Apache::lonnet::allowed('v'.$role,"$audom/$auname")) ||
-                        (&Apache::lonnet::allowed('c'.$role,"$audom/$auname"))) {
-                        push(@allowedroles,$role);
-                    }
-                }
-            } elsif ($env{'request.role'} =~ m{^au\./($match_domain)/}) {
-                if ($1 eq $env{'user.domain'}) {
-                    $auname = $env{'user.name'};
-                    $audom = $env{'user.domain'};
-                }
-                @allowedroles = @possroles;
-            }
-            if (($auname ne '') && ($audom ne '')) {
-                %cstr_roles = &Apache::lonnet::get_my_roles($auname,$audom,undef,
-                                                            \@statuses,\@allowedroles);
-                &gather_userinfo($context,$format,\%userlist,$indexhash,\%userinfo,
-                                 \%cstr_roles,$permission);
-            }
+            my @possroles = &roles_by_context($context);
+            %cstr_roles = &Apache::lonnet::get_my_roles(undef,undef,undef,
+                                              \@statuses,\@possroles);
+            &gather_userinfo($context,$format,\%userlist,$indexhash,\%userinfo,
+                             \%cstr_roles,$permission);
         } elsif ($context eq 'domain') {
             if ($env{'form.roletype'} eq 'domain') {
                 if (grep(/^authorusage$/,@cols)) {
@@ -2105,17 +2187,14 @@ sub get_cols_array {
             push(@cols,'photo');
         }
         if ($context eq 'domain') {
-            push(@cols,('authorusage','authorquota','extent'));
-        }
-        if ($context eq 'author') {
-            push(@cols,'manager');
+            push (@cols,('authorusage','authorquota','extent'));
         }
     }
     return @cols;
 }
 
 sub column_checkboxes {
-    my ($context,$mode,$formname,$showcredits,$showstart,$showend) = @_;
+    my ($context,$mode,$formname,$showcredits) = @_;
     my @cols = &get_cols_array($context,$mode,$showcredits);
     my @showncols = &Apache::loncommon::get_env_multiple('form.showcol');
     my (%disabledchk,%unchecked);
@@ -2128,21 +2207,11 @@ sub column_checkboxes {
             if ($showcredits) {
                 $unchecked{'credits'} = 1;
             }
-            my %curr_groups = &Apache::longroup::coursegroups();
-            unless (keys(%curr_groups)) {
-                $unchecked{'groups'} = 1;
-            }
-        } elsif ($context eq 'domain') {
+        } elsif ($context eq 'domain') { 
             $unchecked{'extent'} = 1; 
         }
-        if ($showstart) {
-            $unchecked{'lastlogin'} = 1;
-        } else {
-            $unchecked{'start'} = 1;
-        }
-        unless ($showend) {
-            $unchecked{'end'} = 1;
-        }
+        $unchecked{'start'} = 1;
+        $unchecked{'end'} = 1;
     } else {
         if ($env{'form.Status'} ne 'Any') {
             $disabledchk{'status'} = 1;
@@ -2159,11 +2228,6 @@ sub column_checkboxes {
             } elsif ($env{'form.roletype'} eq 'domain') {
                 $disabledchk{'extent'} = 1; 
             }
-        } elsif ($context eq 'author') {
-            if (($env{'form.Status'} eq 'Expired') ||
-                ($env{'form.showrole'} eq 'aa')) {
-                $disabledchk{'manager'} = 1;
-            }
         }
     }
     my $numposs = scalar(@cols);
@@ -2255,7 +2319,6 @@ sub get_column_names {
         'ca'         => "check all",
         'ua'         => "uncheck all",
         'clicker'    => "clicker-ID",
-        'manager'    => "co-author manager",
     );
     if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
         $lt{'extent'} = &mt('course(s): description, section(s), status');
@@ -2280,7 +2343,6 @@ sub gather_userinfo {
             ($userdata{'username'},$userdata{'domain'},$userdata{'role'}) =
                 split(/:/,$item);
             ($userdata{'start'},$userdata{'end'})=split(/:/,$rolehash->{$item});
-            next if (($userdata{'username'} eq '') && ($userdata{'domain'} eq ''));
             &build_user_record($context,\%userdata,$userinfo,$indexhash,
                                $item,$userlist);
         } elsif ($context eq 'course') {
@@ -2541,7 +2603,6 @@ sub make_keylist_array {
     $index->{'instsec'} = &Apache::loncoursedata::CL_INSTSEC();
     $index->{'authorquota'} = &Apache::loncoursedata::CL_AUTHORQUOTA();
     $index->{'authorusage'} = &Apache::loncoursedata::CL_AUTHORUSAGE();
-    $index->{'manager'} = &Apache::loncoursedata::CL_CAMANAGER();
     foreach my $key (keys(%{$index})) {
         $keylist->[$index->{$key}] = $key;
     }
@@ -2616,9 +2677,6 @@ sub show_users_list {
             (($env{'form.showrole'} eq 'Any') || ($env{'form.showrole'} eq 'au'))) {
             push(@sortable,('authorusage','authorquota'));
         }
-        if ($context eq 'author') {
-            push(@sortable,'manager');
-        }
     }
     if ($mode eq 'pickauthor') {
         @sortable = ('username','fullname','email','status');
@@ -2936,7 +2994,6 @@ END
     foreach my $idx (@$keylist) {
         $index{$idx} = $i++;
     }
-    my $now = time;
     my $usercount = 0;
     my ($secfilter,$grpfilter);
     if ($context eq 'course') {
@@ -2954,21 +3011,10 @@ END
                                                 Future  => 'Future',
                                                 Expired => 'Expired',
                                                );
-    my (%crslogins,%camanagers);
+    # If this is for a single course get last course "log-in".
+    my %crslogins;
     if ($context eq 'course') {
-        # If this is for a single course get last course "log-in".
         %crslogins=&Apache::lonnet::dump('nohist_crslastlogin',$cdom,$cnum);
-    } elsif ($context eq 'author') {
-        my $authormanagers;
-        if ($env{'request.role'} =~ m{^(?:ca|aa)\./($match_domain)/($match_username)$}) {
-            my %envhash = &Apache::lonnet::userenvironment($1,$2,'authormanagers');
-            $authormanagers = $envhash{'authormanagers'};
-        } else {
-            $authormanagers = $env{'environment.authormanagers'};
-        }
-        if ($authormanagers ne '') {
-            map { $camanagers{$_.':ca'} = 1; } split(/,/,$authormanagers);
-        }
     }
     # Get groups, role, permanent e-mail so we can sort on them if
     # necessary.
@@ -3068,16 +3114,6 @@ END
                 }
             }
         }
-        if ($context eq 'author') {
-            if (($camanagers{$user}) &&
-                ((!defined($userlist->{$user}->[$index{'end'}])) ||
-                 ($userlist->{$user}->[$index{'end'}] == 0) ||
-                 ($userlist->{$user}->[$index{'end'}] > $now))) {
-                $userlist->{$user}->[$index{'manager'}] = &mt('Yes');
-            } else {
-                $userlist->{$user}->[$index{'manager'}] = &mt('No');
-            }
-        }
         my %emails   = &Apache::loncommon::getemails($uname,$udom);
         if ($emails{'permanentemail'} =~ /\S/) {
             $userlist->{$user}->[$index{'email'}] = $emails{'permanentemail'};
@@ -3896,16 +3932,10 @@ sub results_header_row {
             $description .= ' ('.$constraint.')';
         } 
     } elsif ($context eq 'author') {
-        my ($auname,$audom);
-        if ($env{'request.role'} =~ m{^(?:ca|aa)\./($match_domain)/($match_username)$}) {
-            ($audom,$auname) = ($1,$2);
-        } else {
-            ($audom,$auname) = ($env{'user.domain'},$env{'user.name'});
-        }
         $description = 
             &mt('Author space for [_1]'
                 ,'<span class="LC_cusr_emph">'
-                .&Apache::loncommon::plainname($auname,$audom)
+                .&Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'})
                 .'</span>')
             .':&nbsp;&nbsp;';
         if ($statusmode eq 'Expired') {
@@ -4279,7 +4309,7 @@ sub upfile_drop_add {
         $fieldstype{$field.'_choice'} = 'scalar';
     }
     &Apache::loncommon::store_course_settings('enrollment_upload',\%fieldstype);
-    my ($cid,$crstype,$setting,$crsdom,$crsnum,$oldcrsuserdoms,%emptyok);
+    my ($cid,$crstype,$setting,%emptyok);
     if ($context eq 'domain') {
         $setting = $env{'form.roleaction'};
         if (exists($fields{'names'})) {
@@ -4302,19 +4332,10 @@ sub upfile_drop_add {
     if ($env{'request.course.id'} ne '') {
         $cid = $env{'request.course.id'};
         $crstype = &Apache::loncommon::course_type();
-        $crsdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        $crsnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     } elsif ($setting eq 'course') {
         if (&Apache::lonnet::is_course($env{'form.dcdomain'},$env{'form.dccourse'})) {
             $cid = $env{'form.dcdomain'}.'_'.$env{'form.dccourse'};
             $crstype = &Apache::loncommon::course_type($cid);
-            $crsdom = $env{'form.dcdomain'};
-            $crsnum = $env{'form.dccourse'};
-            if (exists($env{'course.'.$cid.'.internal.userdomains'})) {
-                $oldcrsuserdoms = 1;
-            }
-            my %coursedesc = &Apache::lonnet::coursedescription($cid,{ one_time => 1 });
-            $env{'course.'.$cid.'.internal.userdomains'} = $coursedesc{'internal.userdomains'};
         }
     }
     my ($startdate,$enddate) = &get_dates_from_form();
@@ -5033,13 +5054,6 @@ sub upfile_drop_add {
             } # end of loop
             $r->print('</ul>');
             &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-            if (($context eq 'domain') && ($setting eq 'course')) {
-                unless ($oldcrsuserdoms) {
-                    if (exists($env{'course.'.$cid.'.internal.userdomains'})) {
-                        delete($env{'course.'.$cid.'.internal.userdomains'});
-                    }
-                }
-            }
         }
         # Flush the course logs so reverse user roles immediately updated
         $r->register_cleanup(\&Apache::lonnet::flushcourselogs);
@@ -5980,10 +5994,6 @@ sub can_modify_userinfo {
     my %domconfig =
        &Apache::lonnet::get_dom('configuration',['usermodification'],
                                 $dom);
-    if (($context eq 'author') &&
-        ($env{'request.role'} =~ m{^(ca|aa)\./$match_domain/$match_username$})) {
-        $context = 'coauthor';
-    }
     my %canmodify;
     if (ref($fields) eq 'ARRAY') {
         foreach my $field (@{$fields}) {
@@ -6244,23 +6254,8 @@ sub get_permission {
             }
         }
     } elsif ($context eq 'author') {
-        my $audom = $env{'request.role.domain'};
-        my $auname = $env{'user.name'};
-        if ((&Apache::lonnet::allowed('cca',"$audom/$auname")) ||
-            (&Apache::lonnet::allowed('caa',"$audom/$auname"))) {
-            $permission{'author'} = 1;
-            $permission{'cusr'} = 1;
-            $permission{'view'} = 1;
-        }
-    } elsif ($context eq 'coauthor') {
-        my ($audom,$auname) = ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$});
-        if ((&Apache::lonnet::allowed('vca',"$audom/$auname")) ||
-            (&Apache::lonnet::allowed('vaa',"$audom/$auname"))) {
-            if ($env{"environment.internal.manager./$audom/$auname"}) {
-                $permission{'cusr'} = 1;
-                $permission{'view'} = 1;
-            }
-        }
+        $permission{'cusr'} = &authorpriv($env{'user.name'},$env{'request.role.domain'});
+        $permission{'view'} = $permission{'cusr'};
     } else {
         my @allroles = &roles_by_context($context);
         foreach my $role (@allroles) {
@@ -6288,9 +6283,8 @@ sub get_permission {
         }
     }
     my $allowed = 0;
-    foreach my $key (keys(%permission)) {
-        next if (($key eq 'owner') || ($key eq 'co-owner') || ($key eq 'author'));
-        if ($permission{$key}) { $allowed=1; last; }
+    foreach my $perm (values(%permission)) {
+        if ($perm) { $allowed=1; last; }
     }
     return (\%permission,$allowed);
 }
@@ -6303,18 +6297,6 @@ sub authorpriv {
          || (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; }    return 1;
 }
 
-sub coauthorpriv {
-    my ($auname,$audom)=@_;
-    my $uname = $env{'user.name'};
-    my $udom = $env{'user.domain'};
-    if (((&Apache::lonnet::allowed('vca',"$udom/$uname")) ||
-         (&Apache::lonnet::allowed('vaa',"$udom/$uname"))) &&
-         ($env{"environment.internal.manager./$audom/$auname"})) {
-        return 1;
-    }
-    return '';
-}
-
 sub roles_on_upload {
     my ($context,$setting,$crstype,%customroles) = @_;
     my (@possible_roles,@permitted_roles);
@@ -6511,7 +6493,7 @@ sub verify_authen {
         $finish = "document.$formname.submit();";
     }
     my ($numrules,$intargjs) =
-        &Apache::loncommon::passwd_validation_js('argpicked',$domain);
+        &passwd_validation_js('argpicked',$domain);
     my $outcome = <<"ENDSCRIPT";
 
 function auth_check() {