--- loncom/interface/lonuserutils.pm	2024/01/05 04:09:47	1.184.4.10.2.7
+++ loncom/interface/lonuserutils.pm	2022/11/17 19:07:21	1.211
@@ -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.7 2024/01/05 04:09:47 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.211 2022/11/17 19:07:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -103,7 +103,7 @@ sub modifystudent {
 sub modifyuserrole {
     my ($context,$setting,$changeauth,$cid,$udom,$uname,$uid,$umode,$upass,
         $first,$middle,$last,$gene,$sec,$forceid,$desiredhome,$email,$role,
-        $end,$start,$checkid,$inststatus,$emptyok) = @_;
+        $end,$start,$checkid,$inststatus) = @_;
     my ($scope,$userresult,$authresult,$roleresult,$idresult);
     if ($setting eq 'course' || $context eq 'course') {
         $scope = '/'.$cid;
@@ -134,25 +134,6 @@ sub modifyuserrole {
                                   generation => $gene,
                                   id         => $uid,
                                  );
-
-                # When "Update ID in user's course(s)" and "Force change of existing ID"
-                # checkboxes both checked, prevent replacement of name information
-                # in classlist.db file(s) for the user's course(s) with blank(s),
-                # in the case where the uploaded csv file was without column(s) for
-                # the particular field. Fields are: First Name, Middle Names/Initials,
-                # Last Name (or the composite: Last Name, First Names), and Generation.
-
-                my %emptyallowed;
-                if ((ref($emptyok) eq 'HASH') && (keys(%{$emptyok}) > 0)) {
-                    %emptyallowed = %{$emptyok};
-                }
-                foreach my $field (keys(%userupdate)) {
-                    if ($userupdate{$field} eq '') {
-                        unless ($emptyallowed{$field}) {
-                            delete($userupdate{$field});
-                        }
-                    }
-                }
                 $idresult = &propagate_id_change($uname,$udom,\%userupdate);
             }
         }
@@ -529,7 +510,7 @@ END
 ";
     } elsif ($mode eq 'modifycourse') {
         $auth_checks .= "
-    if ((current.argfield !== null) && (current.argfield !== undefined) && (current.argfield !== '') && (vf.elements[current.argfield].value == null || vf.elements[current.argfield].value == '')) {
+    if (vf.elements[current.argfield].value == null || vf.elements[current.argfield].value == '') {
 ";
     }
     if ( ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
@@ -571,6 +552,7 @@ END
             case 'loc':
                 alertmsg = '';
                 break;
+            case 'lti':
             default:
                 alertmsg = '';
         }
@@ -928,6 +910,7 @@ sub print_upload_manager_footer {
     my $krbform = &Apache::loncommon::authform_kerberos(%param);
     my $intform = &Apache::loncommon::authform_internal(%param);
     my $locform = &Apache::loncommon::authform_local(%param);
+    my $ltiform = &Apache::loncommon::authform_lti(%param);
     my $date_table = &date_setting_table(undef,undef,$context,undef,
                                          $formname,$permission,$crstype);
 
@@ -956,7 +939,7 @@ sub print_upload_manager_footer {
             &Apache::loncommon::help_open_topic('Auth_Options').
             "</p>\n";
     }
-    $Str .= &set_login($defdom,$krbform,$intform,$locform);
+    $Str .= &set_login($defdom,$krbform,$intform,$locform,$ltiform);
 
     my ($home_server_pick,$numlib) =
         &Apache::loncommon::home_server_form_item($defdom,'lcserver',
@@ -973,8 +956,14 @@ sub print_upload_manager_footer {
                 &Apache::lonhtmlcommon::row_closure();
     }
 
+    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);
+    }
     $Str .= &Apache::lonhtmlcommon::row_title(&mt('Default domain'))
-           .&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1)
+           .&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1,undef,$trusted,$untrusted)
            .&Apache::lonhtmlcommon::row_closure();
 
     $Str .= &Apache::lonhtmlcommon::row_title(&mt('Starting and Ending Dates'))
@@ -1591,10 +1580,11 @@ sub my_custom_roles {
     my %rolehash=&Apache::lonnet::dump('roles',$udom,$uname);
     foreach my $key (keys(%rolehash)) {
         if ($key=~/^rolesdef\_(\w+)$/) {
+            my $role = $1;
             if ($crstype eq 'Community') {
                 next if ($rolehash{$key} =~ /bre\&S/); 
             }
-            $returnhash{$1}=$1;
+            $returnhash{$role}=$role;
         }
     }
     return %returnhash;
@@ -1607,24 +1597,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';
     }
@@ -1692,7 +1664,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" />'.
@@ -2081,7 +2053,7 @@ sub get_cols_array {
 }
 
 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);
@@ -2094,21 +2066,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;
@@ -4206,42 +4168,19 @@ 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,$crsdom);
     if ($context eq 'domain') {
         $setting = $env{'form.roleaction'};
-        if (exists($fields{'names'})) {
-            map { $emptyok{$_} = 1; } ('lastname','firstname','middlename');
-        } else {
-            if (exists($fields{'lname'})) {
-                $emptyok{'lastname'} = 1;
-            }
-            if (exists($fields{'fname'})) {
-                $emptyok{'firstname'} = 1;
-            }
-            if (exists($fields{'mname'})) {
-                $emptyok{'middlename'} = 1;
-            }
-        }
-        if (exists($fields{'gen'})) {
-            $emptyok{'generation'} = 1;
-        }
     }
     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();
@@ -4252,7 +4191,47 @@ sub upfile_drop_add {
     my $defdom=$env{'request.role.domain'};
     my $domain;
     if ($env{'form.defaultdomain'} ne '') {
-        $domain = $env{'form.defaultdomain'};
+        if (($context eq 'course') || ($setting eq 'course')) {
+            if ($env{'form.defaultdomain'} eq $crsdom) {
+                $domain = $env{'form.defaultdomain'};
+            } else {
+                if (&Apache::lonnet::will_trust('enroll',$crsdom,$env{'form.defaultdomain'})) {
+                    $domain = $env{'form.defaultdomain'};
+                } else {
+                    $r->print('<span class="LC_error">'.&mt('Error').': '.
+                              &mt('Enrollment of users not permitted for specified default domain: [_1].',
+                                  &Apache::lonnet::domain($env{'form.defaultdomain'},'description')).'</span>');
+                    return 'untrusted';
+                }
+            }
+        } elsif ($context eq 'author') {
+            if ($env{'form.defaultdomain'} eq $defdom) {
+                $domain = $env{'form.defaultdomain'}; 
+            } else {
+                if ((&Apache::lonnet::will_trust('othcoau',$defdom,$env{'form.defaultdomain'})) &&
+                    (&Apache::lonnet::will_trust('coaurem',$env{'form.defaultdomain'},$defdom))) {
+                    $domain = $env{'form.defaultdomain'};
+                } else {
+                    $r->print('<span class="LC_error">'.&mt('Error').': '.
+                              &mt('Addition of users not permitted for specified default domain: [_1].',
+                                  &Apache::lonnet::domain($env{'form.defaultdomain'},'description')).'</span>');
+                    return 'untrusted';
+                }
+            }
+        } elsif (($context eq 'domain') && ($setting eq 'domain')) {
+            if ($env{'form.defaultdomain'} eq $defdom) {
+                $domain = $env{'form.defaultdomain'};
+            } else {
+                if (&Apache::lonnet::will_trust('domroles',$defdom,$env{'form.defaultdomain'})) {
+                    $domain = $env{'form.defaultdomain'};
+                } else {
+                    $r->print('<span class="LC_error">'.&mt('Error').': '.
+                              &mt('Addition of users not permitted for specified default domain: [_1].',
+                                  &Apache::lonnet::domain($env{'form.defaultdomain'},'description')).'</span>');
+                    return 'untrusted';
+                }
+            }
+        }
     } else {
         $domain = $defdom;
     }
@@ -4264,7 +4243,6 @@ sub upfile_drop_add {
         if (! exists($home_servers{$desiredhost})) {
             $r->print('<p class="LC_error">'.&mt('Error').': '.
                       &mt('Invalid home server specified').'</p>');
-            $r->print(&Apache::loncommon::end_page());
             return 'invalidhome';
         }
     }
@@ -4292,6 +4270,8 @@ sub upfile_drop_add {
         if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
             $genpwd=$env{'form.locarg'};
         }
+    } elsif ($env{'form.login'} eq 'lti') {
+        $amode='lti';
     }
     if ($amode =~ /^krb/) {
         if (! defined($genpwd) || $genpwd eq '') {
@@ -4444,6 +4424,7 @@ sub upfile_drop_add {
         my (%existinguser,%userinfo,%disallow,%rulematch,%inst_results,%alerts,%checkuname,
             %showpasswdrules,$haspasswdmap);
         my $counter = -1;
+        my (%willtrust,%trustchecked);
         foreach my $line (@userdata) {
             $counter ++;
             my @secs;
@@ -4491,6 +4472,28 @@ sub upfile_drop_add {
                                 '"<b>'.$entries{$fields{'domain'}}.'</b>"',
                                 $fname,$mname,$lname,$gen);
                         next;
+                    } elsif ($entries{$fields{'domain'}} ne $domain) {
+                        my $possdom = $entries{$fields{'domain'}};
+                        if ($context eq 'course' || $setting eq 'course') {
+                            unless ($trustchecked{$possdom}) {
+                                $willtrust{$possdom} = &Apache::lonnet::will_trust('enroll',$domain,$possdom);
+                                $trustchecked{$possdom} = 1;
+                            }
+                        } elsif ($context eq 'author') {
+                            unless ($trustchecked{$possdom}) {
+                                $willtrust{$possdom} = &Apache::lonnet::will_trust('othcoau',$domain,$possdom);
+                            }
+                            if ($willtrust{$possdom}) {
+                                $willtrust{$possdom} = &Apache::lonnet::will_trust('coaurem',$possdom,$domain); 
+                            }
+                        }
+                        unless ($willtrust{$possdom}) {
+                            $disallow{$counter} =
+                                &mt('Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]',
+                                    '"<b>'.$possdom.'</b>"',
+                                    $fname,$mname,$lname,$gen);
+                            next;
+                        }
                     }
                     my $username = $entries{$fields{'username'}};
                     my $userdomain = $entries{$fields{'domain'}};
@@ -4675,7 +4678,7 @@ sub upfile_drop_add {
                                 &mt('The user does not already exist, and you may not create a new user in a different domain.');
                             next;
                         } else {
-                            unless ($password || $env{'form.login'} eq 'loc') {
+                            unless (($password ne '') || ($env{'form.login'} eq 'loc') || ($env{'form.login'} eq 'lti')) {
                                 $disallow{$counter} =
                                     &mt('[_1]: This is a new user but no default password was provided, and the authentication type requires one.',
                                         '<b>'.$username.'</b>');
@@ -4938,7 +4941,7 @@ sub upfile_drop_add {
                                                 $mname,$lname,$gen,$singlesec,
                                                 $env{'form.forceid'},$desiredhost,
                                                 $email,$role,$enddate,$startdate,
-                                                $checkid,$inststatus,\%emptyok);
+                                                $checkid,$inststatus);
                         }
                     }
                     if ($multiple) {
@@ -4960,13 +4963,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);
@@ -5595,7 +5591,7 @@ END
 }
 
 sub set_login {
-    my ($dom,$authformkrb,$authformint,$authformloc) = @_;
+    my ($dom,$authformkrb,$authformint,$authformloc,$authformlti) = @_;
     my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
     my $response;
     my ($authnum,%can_assign) =
@@ -5617,6 +5613,11 @@ sub set_login {
                          '<td>'.$authformloc.'</td>'.
                          &Apache::loncommon::end_data_table_row()."\n";
         }
+        if ($can_assign{'lti'}) {
+            $response .= &Apache::loncommon::start_data_table_row().
+                         '<td>'.$authformlti.'</td>'.
+                         &Apache::loncommon::end_data_table_row()."\n";
+        }
         $response .= &Apache::loncommon::end_data_table();
     }
     return $response;
@@ -6145,9 +6146,6 @@ sub get_permission {
                     $permission{'selfenrolladmin'} = 1;
                 }
             }
-            unless ($permission{'selfenrolladmin'}) {
-                $permission{'selfenrollview'} = 1;
-            }
         }
         if ($env{'request.course.id'}) {
             my $user;
@@ -6611,7 +6609,7 @@ sub selfenrollment_administration {
         }
     }
     if ($settings{'internal.selfenrollmgrdc'} ne '') {
-        @in_domain = split(/,/,$settings{'internal.selfenrollmgrdc'});
+        my @in_domain = split(/,/,$settings{'internal.selfenrollmgrdc'});
         my @diffs = &Apache::loncommon::compare_arrays(\@in_domain,$possconfigs);
         unless (@diffs) {
             return (\@in_course,\@in_domain);