--- loncom/interface/lonsupportreq.pm	2004/11/04 00:57:25	1.10
+++ loncom/interface/lonsupportreq.pm	2004/12/18 22:30:28	1.13
@@ -17,11 +17,14 @@ sub handler {
     if ($r->header_only) {
         return OK;
     }
-
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['action','origurl','function']);
-    my $action = $ENV{'form.action'};
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['origurl','function']);
+    if ($r->uri eq '/adm/helpdesk') {
+        &Apache::loncommon::get_posted_cgi($r);
+    }
     my $function = $ENV{'form.function'};
     my $origurl = &Apache::lonnet::unescape($ENV{'form.origurl'});
+    my $action = $ENV{'form.action'};
+
     if ($action eq 'process') {
         &print_request_receipt($r,$origurl,$function);
     } else {
@@ -50,14 +53,35 @@ sub print_request_form {
     $usec = $ENV{'request.course.sec'};
     $cid = $ENV{'request.course.id'};
     $server = $ENV{'SERVER_NAME'};
-    my $scripttag = (<<END);
+    my $scripttag = (<<'END');
 function validate() {
-    if (document.logproblem.email.value.indexOf("\@") == -1) {
-        alert("You must enter a valid e-mail address");
-        return
+    if (validmail(document.logproblem.email) == false) {
+        alert("The e-mail address you entered: "+document.logproblem.email.value+" is not a valid e-mail address.");
+        return;
     }
     document.logproblem.submit();
 }
+
+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
     if ($cid =~ m/_/) {
         ($cdom,$cnum) = split/_/,$cid;
@@ -765,9 +789,9 @@ END
 
 sub retrieve_instcodes {
     my ($coursecodes,$codedom,$totcodes) = @_;
-    my %courses = &Apache::lonnet::courseiddump($codedom,'.',1);
+    my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.');
     foreach my $course (keys %courses) {
-        if ($courses{$course} =~ m/^[^:]*:([^:]+)$/) {
+        if ($courses{$course} =~ m/^[^:]*:([^:]+)/) {
             $$coursecodes{$course} = &Apache::lonnet::unescape($1);
             $totcodes ++;
         }