--- loncom/interface/lonsupportreq.pm	2015/06/23 02:42:34	1.81
+++ loncom/interface/lonsupportreq.pm	2017/01/18 21:07:31	1.85
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.81 2015/06/23 02:42:34 musolffc Exp $
+# $Id: lonsupportreq.pm,v 1.85 2017/01/18 21:07:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -77,18 +77,18 @@ sub handler {
     }
     return OK;
 }
-    
+   
 sub print_request_form {
     my ($r,$origurl,$function) = @_;
-    my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid,
+    my ($os,$browser,$bversion,$uname,$udom,$uhome,$urole,$usec,$email,$cid,
         $cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server,
-        $formname,$public,$homeserver);
+        $formname,$public,$homeserver,$knownuser,$captcha_form,$captcha_error,
+        $captcha,$recaptcha_version);
     $function = &Apache::loncommon::get_users_function() if (!$function);
     $ccode = '';
     $os = $env{'browser.os'};
     $browser = $env{'browser.type'};
     $bversion = $env{'browser.version'};
-    $uhost = $env{'request.host'};
     if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
         $public = 1;
     } else {
@@ -103,6 +103,14 @@ sub print_request_form {
             }
         }
     }
+    if (($env{'user.name'} =~ /^$match_username$/) && 
+        ($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) {
+        $knownuser = 1;
+    } else {
+        my $lonhost = $r->dir_config('lonHostID');
+        ($captcha_form,$captcha_error,$captcha,$recaptcha_version) =
+            &Apache::loncommon::captcha_display('login',$lonhost);
+    }
     if ($homeserver) {
         $uhome = $env{'user.home'};
         $urole = $env{'request.role'};
@@ -259,7 +267,7 @@ function initialize_codes() {
                 my $allidlist = $idlist{$codetitles[0]};
                 $jscript .= &Apache::courseclassifier::courseset_js_start($formname,$longtitles_str,$allidlist);
                 $jscript .= $scripttext;
-                $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,@codetitles);
+                $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,\@codetitles);
                 $loaditems = '';
             }
         }
@@ -275,6 +283,9 @@ $loaditems
 </script>
 <script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>
 ENDJS
+    if ($recaptcha_version >=2) {
+        $js.= "\n".'<script src="https://www.google.com/recaptcha/api.js"></script>'."\n";
+    }
     my %add_entries = (
                        style    => "margin-top:0px;margin-bottom:0px;",
                        onload   => "initialize_codes();",
@@ -328,8 +339,8 @@ ENDJS
                &Apache::lonhtmlcommon::row_closure();
     $num ++;
     $i = $num%2;
-    if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {
-        if ($homeserver) { 
+    if ($knownuser) {
+        if ($homeserver) {
             $output .= &Apache::lonhtmlcommon::row_title($html_lt{'emac'},undef,$css[$i]).
                        '<input type="text" size="50" name="cc" value="" /><br />'."\n".
                        &Apache::lonhtmlcommon::row_closure();
@@ -342,8 +353,7 @@ ENDJS
                      &HTML::Entities::encode($udom,'"<>&').'" />'."\n";
     my $uname_input = '<input type="hidden" name="uname" value="'.
                       &HTML::Entities::encode($uname,'"<>&').'" />'."\n"; 
-    if (($env{'user.name'} =~ /^$match_username$/) && 
-        ($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) {
+    if ($knownuser) {
         $output .= '<i>'.$html_lt{'unme'}.'</i>:&nbsp;'.$uname.'&nbsp;&nbsp;<i>'.$html_lt{'doma'}.'</i>:&nbsp;'.$udom.$udom_input.$uname_input;
     } else {
         my $udomform = '';
@@ -503,7 +513,7 @@ ENDJS
                &Apache::lonhtmlcommon::row_closure();
     $num ++;
     $i = $num%2; 
-    if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {
+    if ($knownuser) {
         if ($homeserver) {
             $output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i])
                 .' <input type="file" name="screenshot" class="flUpload" size="20" />'
@@ -514,16 +524,13 @@ ENDJS
             $i = $num%2;
         }
     } else {
-        my $lonhost = $r->dir_config('lonHostID');
-        my ($captchaform,$error) = 
-            &Apache::loncommon::captcha_display('login',$lonhost);
-        if ($captchaform) {
+        if ($captcha_form) {
             $output .= &Apache::lonhtmlcommon::row_title(
                            '<span title="'.&mt('required').'">'.
                            &mt('Validation').
                            ' <span class="LC_info">*</span></span>'
                       ,undef,$css[$i]).
-                       $captchaform."\n".
+                       $captcha_form."\n".
                        &Apache::lonhtmlcommon::row_closure();
             $num ++;
             $i = $num%2;