[LON-CAPA-cvs] cvs: loncom /interface createaccount.pm loncommon.pm loncreateuser.pm

[raeburn]

raeburn		Sat Sep 25 20:35:26 2021 EDT

  Modified files:              
    /loncom/interface	loncommon.pm loncreateuser.pm createaccount.pm 
  Log:
  - Captcha on public-facing web forms.  
    - textbox user entry for original Captcha on same line as instructions.
    - validation for reCaptcha 2 moved to immediately above form submission 
      button, as there re-validation is required after 2 minutes.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1366 loncom/interface/loncommon.pm:1.1367
--- loncom/interface/loncommon.pm:1.1366	Tue Sep 21 22:54:26 2021
+++ loncom/interface/loncommon.pm	Sat Sep 25 20:35:26 2021
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1366 2021/09/21 22:54:26 raeburn Exp $
+# $Id: loncommon.pm,v 1.1367 2021/09/25 20:35:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -18296,9 +18296,10 @@
 
         if (-e $Apache::lonnet::perlvar{'lonCaptchaDir'}.'/'.$md5sum.'.png') {
             $output = '<input type="hidden" name="crypt" value="'.$md5sum.'" />'."\n".
+                      '<span class="LC_nobreak">'.
                       &mt('Type in the letters/numbers shown below').' '.
                       '<input type="text" size="5" name="code" value="" autocomplete="off" />'.
-                      '<br />'.
+                      '</span><br />'.
                       '<img src="'.$captcha_params{'www_output_dir'}.'/'.$md5sum.'.png" alt="captcha" />';
             last;
         }
@@ -18344,7 +18345,8 @@
 sub create_recaptcha {
     my ($pubkey,$version) = @_;
     if ($version >= 2) {
-        return '<div class="g-recaptcha" data-sitekey="'.$pubkey.'"></div>';
+        return '<div class="g-recaptcha" data-sitekey="'.$pubkey.'"></div>'.
+               '<div style="padding:0;clear:both;margin:0;border:0"></div>';
     } else {
         my $use_ssl;
         if ($ENV{'SERVER_PORT'} == 443) {
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.454 loncom/interface/loncreateuser.pm:1.455
--- loncom/interface/loncreateuser.pm:1.454	Tue Sep  8 19:38:59 2020
+++ loncom/interface/loncreateuser.pm	Sat Sep 25 20:35:26 2021
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.454 2020/09/08 19:38:59 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.455 2021/09/25 20:35:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2567,10 +2567,11 @@
         if ($usernameset eq 'free') {
             my $onclick = "toggleUsernameDisp(this,'selfcreateusername');"; 
             $output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n".
-                       &mt('Use e-mail address: ').
-                       '<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.&mt('Yes').'</label>'."\n".
-                       (' 'x2).
-                       '<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.&mt('No').'</label>'."\n".
+                       '<span class="LC_nobreak">'.&mt('Use e-mail address: ').
+                       '<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.
+                       &mt('Yes').'</label>'.(' 'x2).
+                       '<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.
+                       &mt('No').'</label></span>'."\n".
                        '<div id="selfcreateusername" style="display: none; font-size: smaller">'.
                        '<br /><span class="LC_nobreak">'.&mt('Preferred username').
                        ' <input type="text" name="username" value="" size="20" autocomplete="off"/>'.
@@ -2674,7 +2675,7 @@
         if ($captchaform) {
             $output .= &Apache::lonhtmlcommon::row_title($lt{'valid'}.'*',
                                                          'LC_pick_box_title')."\n".
-                       $captchaform."\n".'<br /><br />'.
+                       $captchaform."\n".
                        &Apache::lonhtmlcommon::row_closure(1); 
             $rowcount ++;
         }
Index: loncom/interface/createaccount.pm
diff -u loncom/interface/createaccount.pm:1.82 loncom/interface/createaccount.pm:1.83
--- loncom/interface/createaccount.pm:1.82	Fri Dec 18 15:23:02 2020
+++ loncom/interface/createaccount.pm	Sat Sep 25 20:35:26 2021
@@ -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.82 2020/12/18 15:23:02 raeburn Exp $
+# $Id: createaccount.pm,v 1.83 2021/09/25 20:35:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1197,15 +1197,14 @@
             $output .= '
    <input type="hidden" name="crypt" value="" />
    <input type="hidden" name="code" value="" />
+   <br /><br />
 ';
         } elsif ($captcha eq 'recaptcha') {
-            if ($recaptchaversion eq '2') {
-                $output .= "$captchaform\n";
-                undef($captchaform);
-            } else {
+            unless ($recaptchaversion eq '2') {
                 $output .= '
    <input type="hidden" name="recaptcha_challenge_field" value="" />
    <input type="hidden" name="recaptcha_response_field" value="" />
+   <br /><br />
 ';
             }
         }