--- loncom/interface/domainprefs.pm	2019/08/25 14:15:20	1.367
+++ loncom/interface/domainprefs.pm	2020/02/07 20:42:50	1.370
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.367 2019/08/25 14:15:20 raeburn Exp $
+# $Id: domainprefs.pm,v 1.370 2020/02/07 20:42:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -831,6 +831,7 @@ sub print_config_box {
     if ($numheaders > 1) {
         my $colspan = '';
         my $rightcolspan = '';
+        my $leftnobr = '';
         if (($action eq 'rolecolors') || ($action eq 'defaults') ||
             ($action eq 'directorysrch') ||
             (($action eq 'login') && ($numheaders < 4))) {
@@ -839,12 +840,15 @@ sub print_config_box {
         if ($action eq 'usersessions') {
             $rightcolspan = ' colspan="3"'; 
         }
+        if ($action eq 'passwords') {
+            $leftnobr = ' LC_nobreak';
+        }
         $output .= '
           <tr>
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
+              <td class="LC_left_item'.$leftnobr.'"'.$colspan.'>'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
               <td class="LC_right_item"'.$rightcolspan.'>'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
              </tr>';
         $rowtotal ++;
@@ -889,6 +893,7 @@ sub print_config_box {
             ($action eq 'usersessions') || ($action eq 'coursecategories') || 
             ($action eq 'trust') || ($action eq 'contacts') ||
             ($action eq 'privacy') || ($action eq 'passwords')) {
+            my $leftnobr = ' LC_nobreak';
             if ($action eq 'coursecategories') {
                 $output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal);
                 $colspan = ' colspan="2"';
@@ -956,7 +961,7 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
+              <td class="LC_left_item'.$leftnobr.'"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
               <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'."\n";
                     if ($action eq 'passwords') {
                         $output .= $item->{'print'}->('bottom',$dom,$confname,$settings,\$rowtotal);
@@ -6056,7 +6061,7 @@ sub print_passwords {
                 $datatable .= '<span class="LC_nobreak"><label>'.
                               '<input type="checkbox" name="passwords_case_sensitive" value="'.
                               $item.'"'.$checkedcase.' />'.$usertypes->{$item}.'</label>'.
-                              '<span>&nbsp;&nbsp; ';
+                              '</span>&nbsp;&nbsp; ';
             }
         }
         my $checkedcase;
@@ -6160,7 +6165,7 @@ sub print_passwords {
                       &mt('(If you use the same account ...  reset a password from this page.)').'</span><br /><br />'.
                       &mt('Include custom text:');
         if ($customurl) {
-            my $link =  &Apache::loncommon::modal_link($customurl,&mt('Custom text file'),600,500,
+            my $link =  &Apache::loncommon::modal_link($customurl,&mt('custom text'),600,500,
                                                        undef,undef,undef,undef,'background-color:#ffffff');
             $datatable .= '<span class="LC_nobreak">&nbsp;'.$link.
                           '<label><input type="checkbox" name="passwords_custom_del"'.
@@ -6387,7 +6392,7 @@ sub print_passwords {
                     $datatable .= '<span class="LC_nobreak"><label>'.
                                   '<input type="checkbox" name="passwords_crsowner_'.$item.'" value="'.
                                   $type.'"'.$checked.' />'.$usertypes->{$type}.'</label>'.
-                                  '<span>&nbsp;&nbsp; ';
+                                  '</span>&nbsp;&nbsp; ';
                 }
             }
             my $checked;
@@ -9373,8 +9378,8 @@ function warnIntPass(field) {
                             alert('$intalert{passnum}');
                         }
                     }
+                    field.value = '';
                 }
-                field.value = '';
             }
         }
     }
@@ -14565,7 +14570,7 @@ sub modify_passwords {
             if ($current{'resetlink'} ne $linklife) {
                 $changes{'reset'} = 1;
             }
-        } elsif (!exists($domconfig{passwords})) {
+        } elsif (!ref($domconfig{passwords}) eq 'HASH') {
             if ($staticdefaults{'resetlink'} ne $linklife) {
                 $changes{'reset'} = 1;
             }
@@ -14586,7 +14591,7 @@ sub modify_passwords {
         if (@diffs > 0) {
             $changes{'reset'} = 1;
         }
-    } elsif (!exists($domconfig{passwords})) {
+    } elsif (!ref($domconfig{passwords}) eq 'HASH') {
         my @diffs = &Apache::loncommon::compare_arrays($staticdefaults{'resetcase'},\@casesens);
         if (@diffs > 0) {
             $changes{'reset'} = 1;
@@ -14598,7 +14603,7 @@ sub modify_passwords {
             if ($current{'resetprelink'} ne $newvalues{'resetprelink'}) {
                 $changes{'reset'} = 1;
             }
-        } elsif (!exists($domconfig{passwords})) {
+        } elsif (!ref($domconfig{passwords}) eq 'HASH') {
             if ($staticdefaults{'resetprelink'} ne $newvalues{'resetprelink'}) {
                 $changes{'reset'} = 1;
             }
@@ -14625,7 +14630,7 @@ sub modify_passwords {
                 } else {
                     $changes{'reset'} = 1;
                 }
-            } elsif (!exists($domconfig{passwords})) {
+            } elsif (!ref($domconfig{passwords}) eq 'HASH') {
                 my @diffs = &Apache::loncommon::compare_arrays($staticdefaults{'resetpostlink'}{$type},\@postlink);
                 if (@diffs > 0) {
                     $changes{'reset'} = 1;
@@ -14647,7 +14652,7 @@ sub modify_passwords {
             if (@diffs > 0) {
                 $changes{'reset'} = 1;
             }
-        } elsif (!exists($domconfig{passwords})) {
+        } elsif (!ref($domconfig{passwords}) eq 'HASH') {
             my @diffs = &Apache::loncommon::compare_arrays($staticdefaults{'resetemail'},\@resetemail);
             if (@diffs > 0) {
                 $changes{'reset'} = 1;
@@ -14758,6 +14763,8 @@ sub modify_passwords {
                 if ($staticdefaults{$rule} ne $newvalues{$rule}) {
                     $changes{'rules'} = 1;
                 }
+            } else {
+                $changes{'rules'} = 1;
             }
         } elsif (exists($current{$rule})) {
             $changes{'rules'} = 1;
@@ -14806,7 +14813,7 @@ sub modify_passwords {
                 }
             }
         }
-    } elsif (!exists($domconfig{passwords})) {
+    } elsif (!(ref($domconfig{passwords}) eq 'HASH')) {
         foreach my $item ('by','for') {
             if (@{$crsownerchg{$item}} > 0) {
                 $changes{'crsownerchg'} = 1;
@@ -14836,9 +14843,11 @@ sub modify_passwords {
                             $resulttext .= '<li>'.&mt('CAPTCHA validation set to use: original CAPTCHA').'</li>';
                         } elsif ($confighash{'passwords'}{'captcha'} eq 'recaptcha') {
                             $resulttext .= '<li>'.&mt('CAPTCHA validation set to use: reCAPTCHA').' '.
-                                           &mt('version: [_1]',$confighash{'passwords'}{'recaptchaversion'}).'<br />'.
-                                           &mt('Public key: [_1]',$confighash{'passwords'}{'recaptchapub'}).'</br>'.
-                                           &mt('Private key: [_1]',$confighash{'passwords'}{'recaptchapriv'}).'</li>';
+                                           &mt('version: [_1]',$confighash{'passwords'}{'recaptchaversion'}).'<br />';
+                            if (ref($confighash{'passwords'}{'recaptchakeys'}) eq 'HASH') {
+                                $resulttext .= &mt('Public key: [_1]',$confighash{'passwords'}{'recaptchakeys'}{'public'}).'</br>'.
+                                               &mt('Private key: [_1]',$confighash{'passwords'}{'recaptchakeys'}{'private'}).'</li>';
+                            }
                         } else {
                             $resulttext .= '<li>'.&mt('No CAPTCHA validation').'</li>';
                         }
@@ -14917,8 +14926,9 @@ sub modify_passwords {
                         }
                         if ($confighash{'passwords'}{'resetcustom'}) {
                             my $customlink = &Apache::loncommon::modal_link($confighash{'passwords'}{'resetcustom'},
-                                                                            $titles{custom},600,500);
-                            $resulttext .= '<li>'.&mt('Preamble to "Forgot Password" form includes [_1]',$customlink).'</li>';
+                                                                            &mt('custom text'),600,500,undef,undef,
+                                                                            undef,undef,'background-color:#ffffff');
+                            $resulttext .= '<li>'.&mt('Preamble to "Forgot Password" form includes: [_1]',$customlink).'</li>';
                         } else {
                             $resulttext .= '<li>'.&mt('No custom text included in preamble to "Forgot Password" form').'</li>';
                         }
@@ -14964,6 +14974,24 @@ sub modify_passwords {
                                 $resulttext .= '<li>'.&mt('[_1] set to [_2]',$titles{$rule},$confighash{'passwords'}{$rule}).'</li>';
                             }
                         }
+                        if (ref($confighash{'passwords'}{'chars'}) eq 'ARRAY') {
+                            if (@{$confighash{'passwords'}{'chars'}} > 0) {
+                                my %rulenames = &Apache::lonlocal::texthash(
+                                                     uc => 'At least one upper case letter',
+                                                     lc => 'At least one lower case letter',
+                                                     num => 'At least one number',
+                                                     spec => 'At least one non-alphanumeric',
+                                                   );
+                                my $needed = '<ul><li>'.
+                                             join('</li><li>',map {$rulenames{$_} } @{$confighash{'passwords'}{'chars'}}).
+                                             '</li></ul>'; 
+                                $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{'chars'},$needed).'</li>';
+                            } else {
+                                $resulttext .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>';
+                            }
+                        } else {
+                            $resulttext .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>';
+                        }
                     } elsif ($key eq 'crsownerchg') {
                         if (ref($confighash{'passwords'}{'crsownerchg'}) eq 'HASH') {
                             if ((@{$confighash{'passwords'}{'crsownerchg'}{'by'}} == 0) ||
@@ -16103,19 +16131,25 @@ sub modify_selfcreation {
 }
 
 sub process_captcha {
-    my ($container,$changes,$newsettings,$current) = @_;
-    return unless ((ref($changes) eq 'HASH') && (ref($newsettings) eq 'HASH') || (ref($current) eq 'HASH'));
+    my ($container,$changes,$newsettings,$currsettings) = @_;
+    return unless ((ref($changes) eq 'HASH') && (ref($newsettings) eq 'HASH'));
     $newsettings->{'captcha'} = $env{'form.'.$container.'_captcha'};
     unless ($newsettings->{'captcha'} eq 'recaptcha' || $newsettings->{'captcha'} eq 'notused') {
         $newsettings->{'captcha'} = 'original';
     }
-    if ($current->{'captcha'} ne $newsettings->{'captcha'}) {
+    my %current;
+    if (ref($currsettings) eq 'HASH') {
+        %current = %{$currsettings};
+    }
+    if ($current{'captcha'} ne $newsettings->{'captcha'}) {
         if ($container eq 'cancreate') {
             if (ref($changes->{'cancreate'}) eq 'ARRAY') {
                 push(@{$changes->{'cancreate'}},'captcha');
             } elsif (!defined($changes->{'cancreate'})) {
                 $changes->{'cancreate'} = ['captcha'];
             }
+        } elsif ($container eq 'passwords') {
+            $changes->{'reset'} = 1;
         } else {
             $changes->{'captcha'} = 1;
         }
@@ -16137,9 +16171,9 @@ sub process_captcha {
         }
         $newsettings->{'recaptchaversion'} = $newversion;
     }
-    if (ref($current->{'recaptchakeys'}) eq 'HASH') {
-        $currpub = $current->{'recaptchakeys'}{'public'};
-        $currpriv = $current->{'recaptchakeys'}{'private'};
+    if (ref($current{'recaptchakeys'}) eq 'HASH') {
+        $currpub = $current{'recaptchakeys'}{'public'};
+        $currpriv = $current{'recaptchakeys'}{'private'};
         unless ($newsettings->{'captcha'} eq 'recaptcha') {
             $newsettings->{'recaptchakeys'} = {
                                                  public  => '',
@@ -16147,8 +16181,8 @@ sub process_captcha {
                                               }
         }
     }
-    if ($current->{'captcha'} eq 'recaptcha') {
-        $currversion = $current->{'recaptchaversion'};
+    if ($current{'captcha'} eq 'recaptcha') {
+        $currversion = $current{'recaptchaversion'};
         if ($currversion ne '2') {
             $currversion = 1;
         }
@@ -16160,6 +16194,8 @@ sub process_captcha {
             } elsif (!defined($changes->{'cancreate'})) {
                 $changes->{'cancreate'} = ['recaptchaversion'];
             }
+        } elsif ($container eq 'passwords') {
+            $changes->{'reset'} = 1;
         } else {
             $changes->{'recaptchaversion'} = 1;
         }
@@ -16171,6 +16207,8 @@ sub process_captcha {
             } elsif (!defined($changes->{'cancreate'})) {
                 $changes->{'cancreate'} = ['recaptchakeys'];
             }
+        } elsif ($container eq 'passwords') {
+            $changes->{'reset'} = 1;
         } else {
             $changes->{'recaptchakeys'} = 1;
         }