--- loncom/interface/lonsupportreq.pm	2013/01/04 19:07:17	1.67.2.1
+++ loncom/interface/lonsupportreq.pm	2013/07/15 16:13:21	1.73
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.67.2.1 2013/01/04 19:07:17 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.73 2013/07/15 16:13:21 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,7 @@ use Apache::lonhtmlcommon;
 use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::lonacc();
+use Apache::lonauth();
 use Apache::courseclassifier;
 use LONCAPA qw(:DEFAULT :match);
 use HTML::Entities;
@@ -494,6 +495,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;
@@ -523,6 +536,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');
@@ -602,10 +641,8 @@ sub print_request_receipt {
                  adin        => 'Additional information recorded',
     );
 
-    my (@ok_ccs,@bad_ccs,$badccmsg,$okcclist,$public,$homeserver);
-    if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
-        $public = 1;
-    } else {
+    my (@ok_ccs,@bad_ccs,$badccmsg,$okcclist,$homeserver);
+    unless ($public) {
         if (($env{'user.name'} ne '') && ($env{'user.domain'} ne '')) {
             $homeserver = &Apache::lonnet::homeserver($env{'user.name'},
                                                       $env{'user.domain'});
@@ -707,7 +744,7 @@ END
 
     $r->print(<<"END");
 $start_page
-<form name="logproblem">
+<form name="logproblem" action="">
 <input type="hidden" name="command" value="result" />
 </form>
 END
@@ -777,8 +814,7 @@ END
 
     my $attachmentpath = '';
     my $attachmentsize = '';
-    if ((defined($env{'user.name'})) && ($env{'user.name'} ne 'public')
-        && ($env{'user.domain'} ne 'public')) {
+    if ((defined($env{'user.name'})) && (!$public)) {
         if ($homeserver && $env{'form.screenshot.filename'}) {
             $attachmentsize = length($env{'form.screenshot'});
             if ($attachmentsize > 131072) {
@@ -929,6 +965,10 @@ sub print_header {
     } else {
         $linkback = &HTML::Entities::encode($origurl,'"<>&');
     }
+    my $loginhelp = &Apache::lonauth::loginhelpdisplay();
+    if ($loginhelp eq '') {
+        $loginhelp = '/adm/loginproblems.html';
+    }
     $r->print(<<"END");
 <table width="620" border="0" cellspacing="0" cellpadding="0" style="height: 55px;">
  <tr>
@@ -941,7 +981,7 @@ sub print_header {
       </legend>
  <table id="LC_helpmenu_links">
    <tr>
-    <td align="center"><span class="LC_nobreak"><img src="$location/help/help.png" border="0" alt="($lt{'login'})" style="vertical-align:middle" />&nbsp;<b><a href="/adm/loginproblems.html">$lt{'login'}</a></b>&nbsp;</span></td>
+    <td align="center"><span class="LC_nobreak"><img src="$location/help/help.png" border="0" alt="($lt{'login'})" style="vertical-align:middle" />&nbsp;<b><a href="$loginhelp">$lt{'login'}</a></b>&nbsp;</span></td>
     <td align="center"><span class="LC_nobreak">&nbsp;<b>$helpdesk_link<img src="$location/lonIcons/helpdesk.gif" border="0" alt="($lt{'ask'})" style="vertical-align:middle" />&nbsp;$lt{'ask'}</a></b>&nbsp;</span></td>$getstartlink
     <td align="center"><span class="LC_nobreak">&nbsp;<b><a href="$linkback" target="_top"><img src="$location/lonIcons/move_up.gif" border="0" alt="($lt{'back'})" style="vertical-align:middle" />&nbsp;$lt{'back'}</a></b>&nbsp;</span></td>
    </tr>