--- loncom/interface/lonsupportreq.pm	2013/01/04 19:07:17	1.67.2.1
+++ loncom/interface/lonsupportreq.pm	2012/08/27 02:02:57	1.68
@@ -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.68 2012/08/27 02:02:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,9 +36,10 @@ 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;
+ 
 
 sub handler {
     my ($r) = @_;
@@ -56,19 +57,8 @@ sub handler {
     if ($r->uri eq '/adm/helpdesk') {
         &Apache::lonacc::get_posted_cgi($r);
     }
-    my $function;
-    if ($env{'form.function'}) {
-        if (($env{'form.function'} eq 'norole')  ||
-            ($env{'form.function'} eq 'student') ||
-            ($env{'form.function'} eq 'admin')   ||
-            ($env{'form.function'} eq 'author')) {
-            $function = $env{'form.function'};
-        }
-    }
+    my $function = $env{'form.function'};
     my $origurl = $env{'form.origurl'};
-    $origurl =~ s{^https?://}{};
-    $origurl =~ s/(`)//g;
-    $origurl =~ s/\$/\(\$\)/g;
     my $command = $env{'form.command'};
 
     if ($command eq 'process') {
@@ -112,9 +102,13 @@ sub print_request_form {
     }
     $formname = 'logproblem';
     my $machine = &Apache::lonnet::absolute_url();
-    my $sourceurl = $machine.$origurl;
-    $server = $machine.&cleanup_html($origurl);
-    $server =~ s/\?.*$//;
+    if ($origurl =~ m-^https?://-) {
+        $server = $origurl;
+    } else {
+        $server = $machine.$origurl;
+    }
+    my $showserver = $server;
+    $showserver =~ s/\?.*$//;
     my %lt = &Apache::lonlocal::texthash (
                   email => 'The e-mail address you entered',
                   notv => 'is not a valid e-mail address',
@@ -364,8 +358,8 @@ ENDJS
     $num ++;
     $i = $num%2;
     $output .= &Apache::lonhtmlcommon::row_title("$lt{'urlp'}",undef,$css[$i]).
-               $server."\n".'<input type="hidden" name="sourceurl" value="'.
-               &HTML::Entities::encode($sourceurl,'"<>&').'" />'."\n".
+               $showserver."\n".'<input type="hidden" name="sourceurl" value="'.
+               &HTML::Entities::encode($server,'"<>&').'" />'."\n".
                &Apache::lonhtmlcommon::row_closure().
                &Apache::lonhtmlcommon::row_title("$lt{'phon'}",undef,'LC_evenrow_value').
                '<input type="text" size="15" name="phone" /><br />'."\n".
@@ -638,11 +632,10 @@ sub print_request_receipt {
            $okcclist = join(', ',@ok_ccs); 
         } 
         if (@bad_ccs == 1) {
-            if ($bad_ccs[0] ne '') {
-                $badccmsg .= '<br />'.&mt('The following Cc e-mail address is invalid: ').&cleanup_html($bad_ccs[0]);
-            }
+            $badccmsg .= '<br />'.&mt('The following Cc e-mail address is invalid: ').$bad_ccs[0];
         } elsif (@bad_ccs > 1) {
-            $badccmsg .= '<br />'.&mt('The following Cc e-mail addresses are invalid: '). &cleanup_html(join(', ',@bad_ccs));
+            my $bad_cc_string = join(', ',@bad_ccs);
+            $badccmsg .= '<br />'.&mt('The following Cc e-mail addresses are invalid: ').$bad_cc_string;
         }
     }
     $env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'";
@@ -678,12 +671,9 @@ END
                     '<span class="LC_helpform_receipt_cat">'.
                     "$lt{$item}</span>: $showurl<br />\n";
             } elsif ($item eq 'cc') {
-                if ($okcclist) {
-                    my $showcclist = &cleanup_html($okcclist);
-                    $displaymsg .=
-                        '<span class="LC_helpform_receipt_cat">'.
-                        "$lt{$item}</span>: $showcclist<br />\n";
-                }
+                $displaymsg .=
+                    '<span class="LC_helpform_receipt_cat">'.
+                    "$lt{$item}</span>: $okcclist<br />\n";
             } else {
                 my $showitem = $env{'form.'.$item};
                 $showitem = &cleanup_html($showitem);
@@ -923,11 +913,12 @@ sub print_header {
     } else {
         $reviewtext = &mt('Please review the information in "Log-in help" if you are unable to log-in.');
     }
-    my $linkback;
     if ($origurl eq '') {
-        $linkback = 'javascript:history.go(-1)';
-    } else {
-        $linkback = &HTML::Entities::encode($origurl,'"<>&');
+        $origurl = 'javascript:history.go(-1)';
+    }
+    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;">
@@ -941,9 +932,9 @@ 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>
+    <td align="center"><span class="LC_nobreak">&nbsp;<b><a href="$origurl" 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>
  </table>
 </fieldset>
@@ -976,11 +967,8 @@ END
 sub get_domain {
     my $codedom;
     if (exists($env{'form.codedom'})) {
-        if (&Apache::lonnet::domain($env{'form.codedom'}) ne '') {
-            return $env{'form.codedom'};
-        }
-    }
-    if ($env{'request.course.id'}) {
+        $codedom = $env{'form.codedom'};
+    } elsif ($env{'request.course.id'}) {
         $codedom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     } elsif ($env{'request.role.domain'}) {
         $codedom = $env{'request.role.domain'};
@@ -995,7 +983,6 @@ sub cleanup_html {
     my $outgoing;
     if ($incoming ne '') {
         $outgoing = $incoming;
-        $outgoing =~ s/;/&#059;/g;
         $outgoing =~ s/\#/&#035;/g;
         $outgoing =~ s/\&/&#038;/g;
         $outgoing =~ s/</&#060;/g;
@@ -1005,9 +992,6 @@ sub cleanup_html {
         $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;
 }