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

[raeburn]

raeburn		Mon Aug 26 00:15:58 2019 EDT

  Modified files:              
    /loncom/interface	lonuserutils.pm 
  Log:
  - Update $numrules in &passwd_validation_js() if minimum password length > 0
  
  
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.202 loncom/interface/lonuserutils.pm:1.203
--- loncom/interface/lonuserutils.pm:1.202	Sun Aug 25 02:42:56 2019
+++ loncom/interface/lonuserutils.pm	Mon Aug 26 00:15:57 2019
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.202 2019/08/25 02:42:56 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.203 2019/08/26 00:15:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -661,10 +661,7 @@
         if ($passwdconf{'min'} =~ /^\d+$/) {
             if ($passwdconf{'min'} > $min) {
                 $min = $passwdconf{'min'};
-                $numrules ++;
             }
-        } else {
-            $numrules ++;
         }
         if ($passwdconf{'max'} =~ /^\d+$/) {
             $max = $passwdconf{'max'};
@@ -674,7 +671,8 @@
         if (@chars) {
             $numrules ++;
         }
-    } else {
+    }
+    if ($min > 0) {
         $numrules ++;
     }
     if (($min > 0) || ($max ne '') || (@chars > 0)) {