[LON-CAPA-cvs] cvs: loncom(version_2_11_2_educog) /interface lonhtmlcommon.pm

[raeburn]

raeburn		Tue Aug 15 23:47:19 2017 EDT

  Modified files:              (Branch: version_2_11_2_educog)
    /loncom/interface	lonhtmlcommon.pm 
  Log:
  - Use 2.12 feature pre-release, in modified 2.11.2.
    Self-creation of user accounts using e-mail verification with settings
    dependent on requester's (self-reported) institutional status.
    - changes in rev. 1.388
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.358.2.11 loncom/interface/lonhtmlcommon.pm:1.358.2.11.4.1
--- loncom/interface/lonhtmlcommon.pm:1.358.2.11	Wed Mar 15 15:17:43 2017
+++ loncom/interface/lonhtmlcommon.pm	Tue Aug 15 23:47:18 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.358.2.11 2017/03/15 15:17:43 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.358.2.11.4.1 2017/08/15 23:47:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3477,15 +3477,18 @@
 # javascript_valid_email
 #
 # Generates javascript to validate an e-mail address.
-# Returns a javascript function which accetps a form field as argumnent, and
+# Returns a javascript function which accepts a form field as argument, and
 # returns false if field.value does not satisfy two regular expression matches
 # for a valid e-mail address.  Backwards compatible with old browsers without
 # support for javascript RegExp (just checks for @ in field.value in this case). 
 
 sub javascript_valid_email {
     my $scripttag .= <<'END';
-function validmail(field) {
+function validmail(field,suffix) {
     var str = field.value;
+    if (suffix != '' && suffix != undefined) {
+        str += suffix;
+    }
     if (window.RegExp) {
         var reg1str = "(@.*@)|(\\.\\.)|(@\\.)|(\\.@)|(^\\.)";
         var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$"; //"