--- loncom/interface/lonsupportreq.pm	2006/12/12 16:04:40	1.40
+++ loncom/interface/lonsupportreq.pm	2007/05/07 14:02:45	1.43
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.40 2006/12/12 16:04:40 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.43 2007/05/07 14:02:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,12 +27,12 @@
 package Apache::lonsupportreq;
 
 use strict;
-use lib qw(/home/httpd/lib/perl);
 use MIME::Types;
 use MIME::Lite;
 use CGI::Cookie();
 use Apache::Constants qw(:common);
 use Apache::loncommon();
+use Apache::lonhtmlcommon;
 use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::lonacc();
@@ -48,6 +48,10 @@ sub handler {
     if ($r->header_only) {
         return OK;
     }
+    if ($r->uri eq '/adm/helpdesk') {
+	&Apache::lonlocal::get_language_handle($r);
+    }
+
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['origurl','function']);
     if ($r->uri eq '/adm/helpdesk') {
         &Apache::lonacc::get_posted_cgi($r);
@@ -135,29 +139,7 @@ function validate() {
 }
 
 END
-    $scripttag .= <<'END';
-function validmail(field) {
-    var str = field.value;
-    if (window.RegExp) {
-        var reg1str = "(@.*@)|(\\.\\.)|(@\\.)|(\\.@)|(^\\.)";
-        var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$"; //"
-        var reg1 = new RegExp(reg1str);
-        var reg2 = new RegExp(reg2str);
-        if (!reg1.test(str) && reg2.test(str)) {
-            return true;
-        }
-        return false;
-    }
-    else
-    {
-        if(str.indexOf("@") >= 0) {
-            return true;
-        }
-        return false;
-    }
-}
-END
-
+    $scripttag .= &Apache::lonhtmlcommon::javascript_valid_email();
     if ($cid =~ m/_/) {
         ($cdom,$cnum) = split(/_/,$cid);
     }
@@ -741,7 +723,7 @@ $lt{'name'}: $env{'form.username'}
 $lt{'email'}: $env{'form.email'}
 $lt{'unme'}: $env{'form.uname'} - $env{'form.udom'}
 $lt{'tel'}: $env{'form.phone'}
-$lt{'crsi'}: env{'form.title'} - $coursecode - $lt{'secn'}: $env{'form.section'}
+$lt{'crsi'}: $env{'form.title'} - $coursecode - $lt{'secn'}: $env{'form.section'}
 $lt{'subj'}: $env{'form.subject'}
 $lt{'desc'}: $env{'form.description'}
 URL: $env{'form.sourceurl'}