version 1.20, 2006/12/09 23:34:42
|
version 1.22, 2006/12/20 22:23:50
|
Line 110 sub clean_domain {
|
Line 110 sub clean_domain {
|
return $domain; |
return $domain; |
} |
} |
|
|
$match_username = $LONCAPA::username_re = qr{[\w\-.]+}; |
$match_username = $LONCAPA::username_re = qr{\w[\w\-.]+}; |
$match_not_username = $LONCAPA::not_username_re = qr{[^\w\-.]+}; |
$match_not_username = $LONCAPA::not_username_re = qr{[^\w\-.]+}; |
sub clean_username { |
sub clean_username { |
my ($username) = @_; |
my ($username) = @_; |
$username =~ s/^\d+//; |
$username =~ s/^\W+//; |
$username =~ s/$match_not_username//g; |
$username =~ s/$match_not_username//g; |
return $username; |
return $username; |
} |
} |
Line 122 sub clean_username {
|
Line 122 sub clean_username {
|
|
|
$match_courseid = $LONCAPA::courseid_re = qr{\d[\w\-.]+}; |
$match_courseid = $LONCAPA::courseid_re = qr{\d[\w\-.]+}; |
$match_not_courseid = $LONCAPA::not_courseid_re = qr{[^\w\-.]+}; |
$match_not_courseid = $LONCAPA::not_courseid_re = qr{[^\w\-.]+}; |
|
sub clean_courseid { |
|
my ($courseid) = @_; |
|
$courseid =~ s/^\D+//; |
|
$courseid =~ s/$match_not_courseid//g; |
|
return $courseid; |
|
} |
|
|
$match_name = $LONCAPA::name = qr{$match_username|$match_courseid}; |
$match_name = $LONCAPA::name_re = qr{$match_username|$match_courseid}; |
sub clean_name { |
sub clean_name { |
my ($name) = @_; |
my ($name) = @_; |
$name =~ s/$match_not_username//g; |
$name =~ s/$match_not_username//g; |