--- loncom/interface/lonsupportreq.pm	2013/01/04 16:57:38	1.70
+++ loncom/interface/lonsupportreq.pm	2014/01/20 17:25:41	1.78
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.70 2013/01/04 16:57:38 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.78 2014/01/20 17:25:41 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -114,7 +114,7 @@ sub print_request_form {
     $formname = 'logproblem';
     my $machine = &Apache::lonnet::absolute_url();
     my $sourceurl = $machine.$origurl;
-    $server = $machine.&cleanup_html($origurl);
+    $server = $machine.&Apache::loncommon::cleanup_html($origurl);
     $server =~ s/\?.*$//;
     my %lt = &Apache::lonlocal::texthash (
                   email => 'The e-mail address you entered',
@@ -294,6 +294,11 @@ ENDJS
     }
     $r->print('<form method="post" action="" name="logproblem"'.$formtype.'>'."\n");
     my $output = &Apache::lonhtmlcommon::start_pick_box().
+                 &Apache::lonhtmlcommon::row_headline().
+                 '<span class="LC_info">'.
+                 &mt('(All fields marked with * are required.)').
+                 '</span>'.
+                 &Apache::lonhtmlcommon::row_closure().
                  &Apache::lonhtmlcommon::row_title($lt{'name'},undef,$css[$num])."\n";
     my $fullname = '';
     if ((defined($lastname) && $lastname ne '') && (defined($firstname) && $firstname ne '')) {
@@ -311,7 +316,10 @@ ENDJS
                 &Apache::lonhtmlcommon::row_closure()."\n";
     $num ++;
     $i = $num%2;
-    $output .= &Apache::lonhtmlcommon::row_title($lt{'emad'},undef,$css[$i]).
+    $output .= &Apache::lonhtmlcommon::row_title(
+                   '<span title="'.&mt('required').'">'.
+                   $lt{'emad'}.' <span class="LC_info">*</span></span>'
+                  ,undef,$css[$i]).
                '<input type="text" size="20" name="email" value="'.
                &HTML::Entities::encode($email,'"<>&').'" /><br />'."\n".
                &Apache::lonhtmlcommon::row_closure();
@@ -477,11 +485,17 @@ ENDJS
     $output .= &Apache::lonhtmlcommon::row_closure();
     $num ++;
     $i = $num%2; 
-    $output .= &Apache::lonhtmlcommon::row_title($lt{'subj'},undef,'LC_oddrow_value').
-               '  <input type="text" size="40" name="subject" />'."\n".
+    $output .= &Apache::lonhtmlcommon::row_title(
+                   '<span title="'.&mt('required').'">'.
+                   $lt{'subj'}.' <span class="LC_info">*</span></span>'
+                  ,undef,'LC_oddrow_value').
+               '<input type="text" size="40" name="subject" />'."\n".
                &Apache::lonhtmlcommon::row_closure().
-               &Apache::lonhtmlcommon::row_title($lt{'detd'},undef,'LC_evenrow_value').
-               '  <textarea rows="10" cols="45" name="description" style="word-wrap:normal;">'.
+               &Apache::lonhtmlcommon::row_title(
+                   '<span title="'.&mt('required').'">'.
+                   $lt{'detd'}.' <span class="LC_info">*</span></span>'
+                  ,undef,'LC_evenrow_value').
+               '<textarea rows="10" cols="45" name="description" style="word-wrap:normal;">'.
                '</textarea>'."\n".
                &Apache::lonhtmlcommon::row_closure();
     $num ++;
@@ -500,8 +514,11 @@ ENDJS
         my ($captchaform,$error) = 
             &Apache::loncommon::captcha_display('login',$lonhost);
         if ($captchaform) {
-            $output .= &Apache::lonhtmlcommon::row_title(&mt('Validation'),undef,
-                                                         $css[$i])."\n".
+            $output .= &Apache::lonhtmlcommon::row_title(
+                           '<span title="'.&mt('required').'">'.
+                           &mt('Validation').
+                           ' <span class="LC_info">*</span></span>'
+                      ,undef,$css[$i]).
                        $captchaform."\n".
                        &Apache::lonhtmlcommon::row_closure();
             $num ++;
@@ -555,9 +572,14 @@ sub print_request_receipt {
             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.').
+            $r->print(
+                '<h2>'.&mt('Support request failed').'</h2>'.
+                      &Apache::lonhtmlcommon::confirm_success(
+                        &mt('Validation of the code you entered failed.'),1).
+                '<br /><br />'.
+                &Apache::lonhtmlcommon::actionbox([
+                    &mt('[_1]Go back[_2] and try again',
+                        '<a href="javascript:history.go(-1)">','</a>')]).
                       &Apache::loncommon::end_page());
             return;
         }
@@ -641,10 +663,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'});
@@ -677,10 +697,11 @@ sub print_request_receipt {
            $okcclist = join(', ',@ok_ccs); 
         } 
         if (@bad_ccs == 1) {
-            $badccmsg .= '<br />'.&mt('The following Cc e-mail address is invalid: ').$bad_ccs[0];
+            if ($bad_ccs[0] ne '') {
+                $badccmsg .= '<br />'.&mt('The following Cc e-mail address is invalid: ').&Apache::loncommon::cleanup_html($bad_ccs[0]);
+            }
         } elsif (@bad_ccs > 1) {
-            my $bad_cc_string = join(', ',@bad_ccs);
-            $badccmsg .= '<br />'.&mt('The following Cc e-mail addresses are invalid: ').$bad_cc_string;
+            $badccmsg .= '<br />'.&mt('The following Cc e-mail addresses are invalid: '). &Apache::loncommon::cleanup_html(join(', ',@bad_ccs));
         }
     }
     $env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'";
@@ -703,7 +724,7 @@ END
         if ($env{'form.'.$item} ne '') {
             if ($item eq 'description') {
                 my $descrip = $env{'form.description'};
-                $descrip =  &cleanup_html($descrip);
+                $descrip =  &Apache::loncommon::cleanup_html($descrip);
                 $descrip =~ s|[\n\r\f]|<br />|g;
                 $displaymsg .= 
                     '<span class="LC_helpform_receipt_cat">'.
@@ -711,17 +732,20 @@ END
             } elsif ($item eq 'sourceurl') {
                 my $showurl = $env{'form.sourceurl'};
                 $showurl =~ s/\?.*$//;
-                $showurl =  &cleanup_html($showurl);
+                $showurl =  &Apache::loncommon::cleanup_html($showurl);
                 $displaymsg .= 
                     '<span class="LC_helpform_receipt_cat">'.
                     "$lt{$item}</span>: $showurl<br />\n";
             } elsif ($item eq 'cc') {
-                $displaymsg .=
-                    '<span class="LC_helpform_receipt_cat">'.
-                    "$lt{$item}</span>: $okcclist<br />\n";
+                if ($okcclist) {
+                    my $showcclist = &Apache::loncommon::cleanup_html($okcclist);
+                    $displaymsg .=
+                        '<span class="LC_helpform_receipt_cat">'.
+                        "$lt{$item}</span>: $showcclist<br />\n";
+                }
             } else {
                 my $showitem = $env{'form.'.$item};
-                $showitem = &cleanup_html($showitem);
+                $showitem = &Apache::loncommon::cleanup_html($showitem);
                 $displaymsg .= 
                     '<span class="LC_helpform_receipt_cat">'.
                     "$lt{$item}</span>: $showitem<br />\n";
@@ -742,7 +766,7 @@ END
 
     $r->print(<<"END");
 $start_page
-<form name="logproblem">
+<form name="logproblem" action="">
 <input type="hidden" name="command" value="result" />
 </form>
 END
@@ -812,12 +836,12 @@ 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) {
-                $displaymsg .= '<br />'.&mt('The uploaded screenshot file ([_1] bytes) included with your request exceeded the maximum allowed size - 128 KB, and has therefore been discarded.',$attachmentsize);
+                $displaymsg .= '<br /><span class="LC_warning">'.
+                               &mt('The uploaded screenshot file ([_1] bytes) included with your request exceeded the maximum allowed size - 128 KB, and has therefore been discarded.',$attachmentsize).'</span>';
             } else {
                 $attachmentpath=&Apache::lonnet::userfileupload('screenshot',undef,'helprequests');
             }
@@ -999,10 +1023,11 @@ END
         $r->print(<<"END");
  <tr>
   <td colspan="3">$reviewtext 
-  $lt{'ifyo'}<br />
-<span style="font-size:90%;"><b>$lt{'stud'}</b>: 
-$stuwarn $lt{'cont'}</span>
-<br /><br />
+  $lt{'ifyo'}
+<p class="LC_info">
+<b>$lt{'stud'}:</b> 
+$stuwarn $lt{'cont'}
+</p><br />
   </td>
  </tr>
 END
@@ -1029,26 +1054,4 @@ sub get_domain {
     return $codedom;
 }
 
-sub cleanup_html {
-    my ($incoming) = @_;
-    my $outgoing;
-    if ($incoming ne '') {
-        $outgoing = $incoming;
-        $outgoing =~ s/;/&#059;/g;
-        $outgoing =~ s/\#/&#035;/g;
-        $outgoing =~ s/\&/&#038;/g;
-        $outgoing =~ s/</&#060;/g;
-        $outgoing =~ s/>/&#062;/g;
-        $outgoing =~ s/\(/&#040/g;
-        $outgoing =~ s/\)/&#041;/g;
-        $outgoing =~ s/"/&#034;/g;
-        $outgoing =~ s/'/&#039;/g;
-        $outgoing =~ s/\$/&#036;/g;
-        $outgoing =~ s{/}{&#047;}g;
-        $outgoing =~ s/=/&#061;/g;
-        $outgoing =~ s/\\/&#092;/g
-    }
-    return $outgoing;
-}
-
 1;