loncom/interface/lonsupportreq.pm - diff

Return to lonsupportreq.pm CVS log

Up to [LON-CAPA] / loncom / interface

-version 1.12, 2004/12/18 22:21:52
+version 1.13, 2004/12/18 22:30:28
  Line 53  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) {
+     if (validmail(document.logproblem.email) == false) {
-         alert("You must enter a valid e-mail address");
+         alert("The e-mail address you entered: "+document.logproblem.email.value+" is not a valid e-mail address.");
-         return
+         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;