[LON-CAPA-cvs] cvs: loncom / LONCAPA.pm

[raeburn]

raeburn		Tue Jun 15 05:31:43 2010 EDT

  Modified files:              
    /loncom	LONCAPA.pm 
  Log:
  - Bug 6313. 
    - Underscores not allowed in LON-CAPA domain names.
  
  
Index: loncom/LONCAPA.pm
diff -u loncom/LONCAPA.pm:1.29 loncom/LONCAPA.pm:1.30
--- loncom/LONCAPA.pm:1.29	Thu Oct 29 03:23:52 2009
+++ loncom/LONCAPA.pm	Tue Jun 15 05:31:43 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Base routines
 #
-# $Id: LONCAPA.pm,v 1.29 2009/10/29 03:23:52 raeburn Exp $
+# $Id: LONCAPA.pm,v 1.30 2010/06/15 05:31:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -103,8 +103,8 @@
     return $str;
 }
 
-$match_domain     = $LONCAPA::domain_re     = qr{[\w\-.]+};
-$match_not_domain = $LONCAPA::not_domain_re = qr{[^\w\-.]+};
+$match_domain     = $LONCAPA::domain_re     = qr{[[:alnum:]\-.]+};
+$match_not_domain = $LONCAPA::not_domain_re = qr{[^[:alnum:]\-.]+};
 sub clean_domain {
     my ($domain) = @_;
     $domain =~ s/$match_not_domain//g;