--- loncom/interface/createaccount.pm	2017/11/12 20:42:52	1.76
+++ loncom/interface/createaccount.pm	2019/05/05 04:00:42	1.77
@@ -4,7 +4,7 @@
 # kerberos, or SSO) or an e-mail address. Requests to use an e-mail address as
 # username may be processed automatically, or may be queued for approval.
 #
-# $Id: createaccount.pm,v 1.76 2017/11/12 20:42:52 raeburn Exp $
+# $Id: createaccount.pm,v 1.77 2019/05/05 04:00:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use Apache::lonacc;
 use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonhtmlcommon;
+use Apache::lonuserutils;
 use Apache::lonlocal;
 use Apache::lonauth;
 use Apache::resetpw;
@@ -520,10 +521,12 @@ ENDSCRIPT
 }
 
 sub javascript_checkpass {
-    my ($now,$context) = @_;
+    my ($now,$context,$domain) = @_;
     my $nopass = &mt('You must enter a password.');
     my $mismatchpass = &mt('The passwords you entered did not match.')."\n".
                        &mt('Please try again.'); 
+    my ($numrules,$intargjs) =
+        &Apache::lonuserutils::passwd_validation_js('upass',$domain);
     &js_escape(\$nopass);
     &js_escape(\$mismatchpass);
     my $js = <<"ENDSCRIPT";
@@ -540,6 +543,10 @@ sub javascript_checkpass {
                 return false;
             }
             if (upass == upasscheck) {
+                var numrules = $numrules;
+                if (numrules > 0) {
+$intargjs
+                }
                 client.elements.upasscheck$now.value='';
                 if (validate_email(client)) {
                     send(one,two,'$context');
@@ -1096,7 +1103,7 @@ sub print_dataentry_form {
         close($jsh);
         $output = &javascript_setforms($now,$emailusername,$captcha,$usertype,$recaptchaversion,
                                        $usernameset,$condition,$excluded).
-                  "\n".&javascript_checkpass($now,'email');
+                  "\n".&javascript_checkpass($now,'email',$domain);
         my ($lkey,$ukey) = &Apache::loncommon::des_keys();
         my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
         my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount:createaccount',