[LON-CAPA-cvs] cvs: loncom /interface domainprefs.pm

[raeburn]

raeburn		Tue Oct 15 03:26:00 2019 EDT

  Modified files:              
    /loncom/interface	domainprefs.pm 
  Log:
  - Display changes to domain configuration for passwords in case where no
    config previously set and/or changes made to Captcha settings.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.367 loncom/interface/domainprefs.pm:1.368
--- loncom/interface/domainprefs.pm:1.367	Sun Aug 25 14:15:20 2019
+++ loncom/interface/domainprefs.pm	Tue Oct 15 03:26:00 2019
@@ -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.368 2019/10/15 03:26:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -14565,7 +14565,7 @@
             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 +14586,7 @@
         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 +14598,7 @@
             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 +14625,7 @@
                 } 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 +14647,7 @@
             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;
@@ -14806,7 +14806,7 @@
                 }
             }
         }
-    } elsif (!exists($domconfig{passwords})) {
+    } elsif (!(ref($domconfig{passwords}) eq 'HASH')) {
         foreach my $item ('by','for') {
             if (@{$crsownerchg{$item}} > 0) {
                 $changes{'crsownerchg'} = 1;
@@ -16116,6 +16116,8 @@
             } elsif (!defined($changes->{'cancreate'})) {
                 $changes->{'cancreate'} = ['captcha'];
             }
+        } elsif ($container eq 'passwords') {
+            $changes->{'reset'} = 1;
         } else {
             $changes->{'captcha'} = 1;
         }
@@ -16160,6 +16162,8 @@
             } elsif (!defined($changes->{'cancreate'})) {
                 $changes->{'cancreate'} = ['recaptchaversion'];
             }
+        } elsif ($container eq 'passwords') {
+            $changes->{'reset'} = 1;
         } else {
             $changes->{'recaptchaversion'} = 1;
         }
@@ -16171,6 +16175,8 @@
             } elsif (!defined($changes->{'cancreate'})) {
                 $changes->{'cancreate'} = ['recaptchakeys'];
             }
+        } elsif ($container eq 'passwords') {
+            $changes->{'reset'} = 1;
         } else {
             $changes->{'recaptchakeys'} = 1;
         }