--- loncom/interface/domainprefs.pm	2025/01/14 13:38:26	1.447.2.5
+++ loncom/interface/domainprefs.pm	2025/01/14 00:49:34	1.450
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.447.2.5 2025/01/14 13:38:26 raeburn Exp $
+# $Id: domainprefs.pm,v 1.450 2025/01/14 00:49:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -222,10 +222,10 @@ sub handler {
                 'coursedefaults','usersessions','loadbalancing',
                 'requestauthor','selfenrollment','inststatus',
                 'ltitools','toolsec','ssl','trust','lti','ltisec',
-                'privacy','passwords','wafproxy',
+                'privacy','passwords','proctoring','wafproxy',
                 'ipaccess','authordefaults'],$dom);
     my %encconfig =
-        &Apache::lonnet::get_dom('encconfig',['ltitools','lti','linkprot'],$dom,undef,1);
+        &Apache::lonnet::get_dom('encconfig',['ltitools','lti','proctoring','linkprot'],$dom,undef,1);
     my ($checked_is_home,$is_home);
     if (ref($domconfig{'ltitools'}) eq 'HASH') {
         if (ref($encconfig{'ltitools'}) eq 'HASH') {
@@ -288,12 +288,24 @@ sub handler {
             }
         }
     }
+    if (ref($domconfig{'proctoring'}) eq 'HASH') {
+        if (ref($encconfig{'proctoring'}) eq 'HASH') {
+            foreach my $provider (keys(%{$domconfig{'proctoring'}})) {
+                if ((ref($domconfig{'proctoring'}{$provider}) eq 'HASH') &&
+                    (ref($encconfig{'proctoring'}{$provider}) eq 'HASH')) {
+                    foreach my $item ('key','secret') {
+                        $domconfig{'proctoring'}{$provider}{$item} = $encconfig{'proctoring'}{$provider}{$item};
+                    }
+                }
+            }
+        }
+    }
     my @prefs_order = ('rolecolors','login','ipaccess','defaults','wafproxy','passwords',
                        'quotas','autoenroll','autoupdate','autocreate','directorysrch',
                        'contacts','privacy','usercreation','selfcreation',
                        'usermodification','scantron','requestcourses','requestauthor',
                        'coursecategories','serverstatuses','helpsettings','coursedefaults',
-                       'authordefaults','ltitools','selfenrollment',
+                       'authordefaults','ltitools','proctoring','selfenrollment',
                        'usersessions','ssl','trust','lti');
     my %existing;
     if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
@@ -563,7 +575,11 @@ sub handler {
                   header => [{col1 => 'Role assigned in different domain',
                               col2 => 'Approval options'},
                              {col1 => 'Role assigned in different domain to user of type',
-                              col2 => 'User information available in that domain'}],
+                              col2 => 'User information available in that domain'},
+                             {col1 => "Role assigned in user's domain",
+                              col2 => 'Information viewable by privileged user'},
+                             {col1 => "Role assigned in user's domain",
+                              col2 => 'Information viewable by unprivileged user'}],
                   print => \&print_privacy,
                   modify => \&modify_privacy,
                  },
@@ -602,6 +618,14 @@ sub handler {
                   print => \&print_ltitools,
                   modify => \&modify_ltitools,
                  },
+        'proctoring' =>
+                 {text => 'Remote Proctoring Integration',
+                  help => 'Domain_Configuration_Proctoring',
+                  header => [{col1 => 'Name',
+                              col2 => 'Configuration'}],
+                  print => \&print_proctoring,
+                  modify => \&modify_proctoring,
+                 },
         'ssl' =>
                  {text  => 'LON-CAPA Network (SSL)',
                   help  => 'Domain_Configuration_Network_SSL',
@@ -863,6 +887,8 @@ sub process_changes {
         $output = &modify_loadbalancing($dom,%domconfig);
     } elsif ($action eq 'ltitools') {
         $output = &modify_ltitools($r,$dom,$action,$lastactref,%domconfig);
+    } elsif ($action eq 'proctoring') {
+        $output = &modify_proctoring($r,$dom,$action,$lastactref,%domconfig);
     } elsif ($action eq 'ssl') {
         $output = &modify_ssl($dom,$lastactref,%domconfig);
     } elsif ($action eq 'trust') {
@@ -914,6 +940,8 @@ sub print_config_box {
     } elsif ($action eq 'lti') {
         $output .= &passwords_javascript('ltisecrets')."\n".
                    &lti_javascript($dom,$settings);
+    } elsif ($action eq 'proctoring') {
+        $output .= &proctoring_javascript($settings);
     } elsif ($action eq 'wafproxy') {
         $output .= &wafproxy_javascript($dom);
     } elsif ($action eq 'autoupdate') {
@@ -1004,8 +1032,8 @@ sub print_config_box {
             ($action eq 'selfcreation') || ($action eq 'selfenrollment') ||
             ($action eq 'usersessions') || ($action eq 'coursecategories') || 
             ($action eq 'trust') || ($action eq 'contacts') || ($action eq 'defaults') ||
-            ($action eq 'passwords') || ($action eq 'lti') || ($action eq 'ltitools') ||
-            ($action eq 'usermodification')) {
+            ($action eq 'privacy') || ($action eq 'passwords') || ($action eq 'lti') ||
+            ($action eq 'ltitools') || ($action eq 'usermodification')) {
             if ($action eq 'coursecategories') {
                 $output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal);
                 $colspan = ' colspan="2"';
@@ -1075,8 +1103,8 @@ sub print_config_box {
              </tr>'."\n";
                 if ($action eq 'coursecategories') {
                     $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
-                } elsif (($action eq 'contacts') || ($action eq 'passwords') || 
-                         ($action eq 'lti')) {
+                } elsif (($action eq 'contacts') || ($action eq 'privacy') || 
+                         ($action eq 'passwords') || ($action eq 'lti')) {
                     if ($action eq 'passwords') {
                         $output .= $item->{'print'}->('lower',$dom,$confname,$settings,\$rowtotal);
                     } else {
@@ -1111,7 +1139,7 @@ sub print_config_box {
             $rowtotal ++;
         } elsif (($action eq 'coursedefaults') || ($action eq 'authordefaults') ||
                  ($action eq 'directorysrch') || ($action eq 'helpsettings') ||
-                 ($action eq 'wafproxy') || ($action eq 'privacy')) {
+                 ($action eq 'wafproxy')) {
             $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'scantron') {
             $output .= $item->{'print'}->($r,'bottom',$dom,$confname,$settings,\$rowtotal);
@@ -1314,7 +1342,7 @@ sub print_config_box {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
         } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || 
                  ($action eq 'serverstatuses') || ($action eq 'loadbalancing') || 
-                 ($action eq 'ipaccess')) {
+                 ($action eq 'proctoring') || ($action eq 'ipaccess')) {
             $output .= $item->{'print'}->($dom,$settings,\$rowtotal);
         }
     }
@@ -7785,7 +7813,7 @@ sub print_privacy {
         ($othertitle,$usertypes,$types) =
             &Apache::loncommon::sorted_inst_types($dom);
     }
-    if (($position eq 'top') || ($position eq 'bottom')) {
+    if (($position eq 'top') || ($position eq 'middle')) {
         my (%by_ip,%by_location,@intdoms,@instdoms);
         &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
         if ($position eq 'top') {
@@ -7872,7 +7900,7 @@ sub print_privacy {
                 $datatable .= &mt('Nothing to set here, as there are no other domains');
             }
             $datatable .='</td></tr>';
-        } elsif ($position eq 'bottom') {
+        } elsif ($position eq 'middle') {
             if ((@instdoms > 1) || (keys(%by_location) > 0)) {
                 if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
                     foreach my $item (@{$types}) {
@@ -7909,6 +7937,19 @@ sub print_privacy {
                 }
             }
         }
+    } else {
+        my $prefix;
+        if ($position eq 'lower') {
+            $prefix = 'priv';
+        } else {
+            $prefix = 'unpriv';
+        }
+        foreach my $item (@items) {
+            $datatable .= &modifiable_userdata_row('privacy',$prefix.'_'.$item,$settings,
+                                                   $numinrow,$itemcount,'','','','','',
+                                                   '',$names{$item});
+            $itemcount ++;
+        }
     }
     if (ref($rowtotal)) {
         $$rowtotal += $itemcount;
@@ -7937,6 +7978,7 @@ sub print_passwords {
         min            => 'Minimum password length',
         max            => 'Maximum password length',
         chars          => 'Required characters',
+        expire         => 'Password expiration (days)',
         numsaved       => 'Number of previous passwords to save and disallow reuse',
     );
     if ($position eq 'top') {
@@ -8263,7 +8305,7 @@ sub print_passwords {
 
 sub password_rules {
     my ($prefix,$itemcountref,$settings) = @_;
-    my ($min,$max,%chars,$numsaved,$numinrow);
+    my ($min,$max,%chars,$expire,$numsaved,$numinrow);
     my %titles;
     if ($prefix eq 'passwords') {
         %titles = &Apache::lonlocal::texthash (
@@ -8295,6 +8337,9 @@ sub password_rules {
             map { $chars{$_} = 1; } (@{$settings->{chars}});
         }
         if ($prefix eq 'passwords') {
+            if ($settings->{expire}) {
+                $expire = $settings->{expire};
+            }
             if ($settings->{numsaved}) {
                 $numsaved = $settings->{numsaved};
             }
@@ -8356,8 +8401,17 @@ sub password_rules {
     $datatable .='</table></td></tr>';
     $itemcount ++;
     if ($prefix eq 'passwords') {
+        $titles{'expire'} = &mt('Password expiration (days)');
         $titles{'numsaved'} = &mt('Number of previous passwords to save and disallow reuse');
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
+        $datatable .= '<tr'.$css_class.'><td>'.$titles{'expire'}.'</td>'.
+                      '<td class="LC_left_item"><span class="LC_nobreak">'.
+                      '<input type="text" name="'.$prefix.'_expire" value="'.$expire.'" size="4" '.
+                      'onblur="javascript:warnInt'.$prefix.'(this);" />'.
+                      '<span class="LC_fontsize_small"> '.&mt('(Leave blank for no expiration)').'</span>'.
+                      '</span></td></tr>';
+        $itemcount ++;
+        $css_class = $itemcount%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'><td>'.$titles{'numsaved'}.'</td>'.
                       '<td class="LC_left_item"><span class="LC_nobreak">'.
                       '<input type="text" name="'.$prefix.'_numsaved" value="'.$numsaved.'" size="3" '.
@@ -11739,15 +11793,29 @@ function warnInt$prefix(field) {
             field.value = '';
         }
         if (field.value != '') {
-            if (!regexdigit.test(field.value)) {
-                if (field.name == '${prefix}_max') {
-                    alert('$intalert{passmax}');
+            if (field.name == '${prefix}_expire') {
+                var regexpposnum=/^\\d+(|\\.\\d*)\$/; 
+                if (!regexpposnum.test(field.value)) {
+                    alert('$intalert{passexp}');
+                    field.value = '';
                 } else {
-                    if (field.name == '${prefix}_numsaved') {
-                        alert('$intalert{passnum}');
+                    var expval = parseFloat(field.value);
+                    if (expval == 0) {
+                        alert('$intalert{passexp}');
+                        field.value = '';
+                    }
+                }
+            } else {
+                if (!regexdigit.test(field.value)) {
+                    if (field.name == '${prefix}_max') {
+                        alert('$intalert{passmax}');
+                    } else {
+                        if (field.name == '${prefix}_numsaved') {
+                            alert('$intalert{passnum}');
+                        }
                     }
+                    field.value = '';
                 }
-                field.value = '';
             }
         }
     }
@@ -17866,6 +17934,8 @@ sub modify_privacy {
                                        extdom  => {},
                                      },
                        'othdom'   => {},
+                       'priv'     => {},
+                       'unpriv'   => {},
                       );
     foreach my $item (@items) {
         if (@instdoms > 1) {
@@ -17896,6 +17966,41 @@ sub modify_privacy {
                 $changes{'approval'} = 1;
             }
         }
+        foreach my $status ('priv','unpriv') {
+            my @possibles = sort(&Apache::loncommon::get_env_multiple('form.privacy_'.$status.'_'.$item));
+            my @newvalues;
+            foreach my $field (@possibles) {
+                if (grep(/^\Q$field\E$/,@fields)) {
+                    $privacyhash{$status}{$item}{$field} = 1;
+                    push(@newvalues,$field);
+                }
+            }
+            @newvalues = sort(@newvalues);
+            if (ref($current{$status}) eq 'HASH') {
+                if (ref($current{$status}{$item}) eq 'HASH') {
+                    my @currvalues = sort(keys(%{$current{$status}{$item}}));
+                    my @diffs = &Apache::loncommon::compare_arrays(\@currvalues,\@newvalues);
+                    if (@diffs > 0) {
+                        $changes{$status} = 1;
+                    }
+                } elsif (@newvalues > 0) {
+                    $changes{$status} = 1;
+                }
+            } else {
+                my @stdfields;
+                foreach my $field (@fields) {
+                    if ($field eq 'id') {
+                        next if ($status eq 'unpriv');
+                        next if (($status eq 'priv') && ($item eq 'community'));
+                    }
+                    push(@stdfields,$field);
+                }
+                my @diffs = &Apache::loncommon::compare_arrays(\@stdfields,\@newvalues);
+                if (@diffs > 0) {
+                    $changes{$status} = 1;
+                }
+            }
+        }
     }
     if ((@instdoms > 1) || (keys(%by_location) > 0)) {
         my @statuses;
@@ -17950,7 +18055,7 @@ sub modify_privacy {
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made: ').'<ul>';
-            foreach my $key ('approval','notify','othdom') {
+            foreach my $key ('approval','notify','othdom','priv','unpriv') {
                 if ($changes{$key}) {
                     $resulttext .= '<li>'.$titles{$key}.':<ul>';
                     if ($key eq 'approval') {
@@ -18001,6 +18106,18 @@ sub modify_privacy {
                                 $resulttext .= '</li>';
                             }
                         }
+                    } else {
+                        foreach my $item (@items) {
+                            if (ref($privacyhash{$key}{$item}) eq 'HASH') {
+                                $resulttext .= '<li>'.$names{$item}.': ';
+                                if (keys(%{$privacyhash{$key}{$item}})) {
+                                    $resulttext .= join(', ', map { $fieldnames{$_}; } (sort(keys(%{$privacyhash{$key}{$item}}))));
+                                } else {
+                                    $resulttext .= &mt('none');
+                                }
+                                $resulttext .= '</li>';
+                            }
+                        }
                     }
                     $resulttext .= '</ul></li>';
                 }
@@ -18063,6 +18180,7 @@ sub modify_passwords {
         min            => 'Minimum password length',
         max            => 'Maximum password length',
         chars          => 'Required characters',
+        expire         => 'Password expiration (days)',
         numsaved       => 'Number of previous passwords to save',
         reset          => 'Resetting Forgotten Password',
         intauth        => 'Encryption of Stored Passwords (Internal Auth)',
@@ -18446,7 +18564,7 @@ sub modify_passwords {
                             $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$titles{$key.'_'.$item},$value).'</li>';
                         }
                     } elsif ($key eq 'rules') {
-                        foreach my $rule ('min','max','numsaved') {
+                        foreach my $rule ('min','max','expire','numsaved') {
                             if ($confighash{'passwords'}{$rule} eq '') {
                                 if ($rule eq 'min') {
                                     $resulttext .= '<li>'.&mt('[_1] not set.',$titles{$rule});
@@ -18541,7 +18659,7 @@ sub password_rule_changes {
                    (ref($changes) eq 'HASH'));
     my (@rules,%staticdefaults);
     if ($prefix eq 'passwords') {
-        @rules = ('min','max','numsaved');
+        @rules = ('min','max','expire','numsaved');
     } elsif (($prefix eq 'ltisecrets') || ($prefix eq 'toolsecrets')) {
         @rules = ('min','max');
     }
@@ -18549,7 +18667,12 @@ sub password_rule_changes {
     foreach my $rule (@rules) {
         $env{'form.'.$prefix.'_'.$rule} =~ s/^\s+|\s+$//g;
         my $ruleok;
-        if ($rule eq 'min') {
+        if ($rule eq 'expire') {
+            if (($env{'form.'.$prefix.'_'.$rule} =~ /^\d+(|\.\d*)$/) &&
+                ($env{'form.'.$prefix.'_'.$rule} ne '0')) {
+                $ruleok = 1;
+            }
+        } elsif ($rule eq 'min') {
             if ($env{'form.'.$prefix.'_'.$rule} =~ /^\d+$/) {
                 if ($env{'form.'.$prefix.'_'.$rule} >= $staticdefaults{$rule}) {
                     $ruleok = 1;