--- loncom/interface/lonsupportreq.pm	2012/08/27 02:02:57	1.68
+++ loncom/interface/lonsupportreq.pm	2012/08/27 06:28:06	1.69
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.68 2012/08/27 02:02:57 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.69 2012/08/27 06:28:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -488,6 +488,18 @@ ENDJS
             $num ++;
             $i = $num%2;
         }
+    } else {
+        my $lonhost = $r->dir_config('lonHostID');
+        my ($captchaform,$error) = 
+            &Apache::loncommon::captcha_display('login',$lonhost);
+        if ($captchaform) {
+            $output .= &Apache::lonhtmlcommon::row_title(&mt('Validation'),undef,
+                                                         $css[$i])."\n".
+                       $captchaform."\n".
+                       &Apache::lonhtmlcommon::row_closure();
+            $num ++;
+            $i = $num%2;
+        }
     }
     $output .= &Apache::lonhtmlcommon::row_title($lt{'fini'},undef,$css[$i]);
     $output .= <<END;
@@ -517,6 +529,32 @@ END
 
 sub print_request_receipt {
     my ($r,$url,$function) = @_;
+    my $public;
+    if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
+        $public = 1;
+    }
+    unless (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {
+        my $lonhost = $r->dir_config('lonHostID');
+        my ($captcha_chk,$captcha_error) = 
+            &Apache::loncommon::captcha_response('login',$lonhost);
+        if ($captcha_chk != 1) {
+            $r->print(&Apache::loncommon::start_page('Support request failed',undef,
+                                       {'function'    => $function,
+                                        'add_entries' => {
+                                            topmargin    => "0",
+                                            marginheight => "0",
+                                        },
+                                        'only_body'   => 1,}));
+            if ($r->uri eq '/adm/helpdesk') {
+                &print_header($r,$url,'process');
+            }
+            $r->print('<h3>'.&mt('Support request failed').'</h3>'.
+                      '<span class="LC_error">'.
+                      &mt('Validation of the code you entered failed.').
+                      &Apache::loncommon::end_page());
+            return;
+        }
+    }
     my @ENVvars = ('HTTP_HOST','HTTP_USER_AGENT','REMOTE_ADDR','SERVER_ADDR','SERVER_NAME');
     my @envvars = ('browser.os','browser.type','browser.version','user.home','request.role');
     my @loncvars = ('user.name','user.domain','request.course.sec','request.course.id');