--- loncom/LONCAPA.pm	2006/12/01 21:52:28	1.16
+++ loncom/LONCAPA.pm	2006/12/10 23:06:13	1.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Base routines
 #
-# $Id: LONCAPA.pm,v 1.16 2006/12/01 21:52:28 albertel Exp $
+# $Id: LONCAPA.pm,v 1.21 2006/12/10 23:06:13 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -110,11 +110,11 @@ sub clean_domain {
     return $domain;
 }
 
-$match_username     = $LONCAPA::username_re     = qr{[^a-zA-Z\_][\w\-.]+};
+$match_username     = $LONCAPA::username_re     = qr{\w[\w\-.]+};
 $match_not_username = $LONCAPA::not_username_re = qr{[^\w\-.]+};
 sub clean_username {
     my ($username) = @_;
-    $username =~ s/^\d+//;
+    $username =~ s/^\W+//;
     $username =~ s/$match_not_username//g;
     return $username;
 }
@@ -122,12 +122,8 @@ sub clean_username {
 
 $match_courseid     = $LONCAPA::courseid_re     = qr{\d[\w\-.]+};
 $match_not_courseid = $LONCAPA::not_courseid_re = qr{[^\w\-.]+};
-sub is_courseid {
-    my ($courseid) = @_;
-    return ($courseid =~ m/^$match_courseid$/);
-}
 
-$match_name  = qr{$match_username|$match_courseid};
+$match_name         = $LONCAPA::name = qr{$match_username|$match_courseid};
 sub clean_name {
     my ($name) = @_;
     $name =~ s/$match_not_username//g;